|
@@ -5991,6 +5991,7 @@ int la_DrawUiListRecursive(laUiListDraw *uild, laUiList *uil, int L, int R, int
|
|
int CanGetState = laCanGetState(ui->PP.LastPs->p);
|
|
int CanGetState = laCanGetState(ui->PP.LastPs->p);
|
|
int CanGetTheme = laCanGetTheme(ui->PP.LastPs->p);laTheme* OriginalTheme=MAIN.CurrentTheme;
|
|
int CanGetTheme = laCanGetTheme(ui->PP.LastPs->p);laTheme* OriginalTheme=MAIN.CurrentTheme;
|
|
void *Active = laGetActiveInstanceStrict(ui->PP.LastPs->p, ui->PP.LastPs->UseInstance);
|
|
void *Active = laGetActiveInstanceStrict(ui->PP.LastPs->p, ui->PP.LastPs->UseInstance);
|
|
|
|
+ void* SaveInstance = ui->PP.EndInstance;
|
|
for (sub = ui->Subs.pFirst; sub; sub = sub->Item.pNext){
|
|
for (sub = ui->Subs.pFirst; sub; sub = sub->Item.pNext){
|
|
int State;
|
|
int State;
|
|
ui->PP.EndInstance = sub->Instance;
|
|
ui->PP.EndInstance = sub->Instance;
|
|
@@ -6025,7 +6026,8 @@ int la_DrawUiListRecursive(laUiListDraw *uild, laUiList *uil, int L, int R, int
|
|
|
|
|
|
if(CanGetTheme){ la_SwitchThemeQuick(0, OriginalTheme); }
|
|
if(CanGetTheme){ la_SwitchThemeQuick(0, OriginalTheme); }
|
|
}
|
|
}
|
|
- ui->PP.EndInstance = Active;
|
|
|
|
|
|
+ //ui->PP.EndInstance = Active;
|
|
|
|
+ ui->PP.EndInstance = SaveInstance;
|
|
}elif (ui->Type == _LA_UI_CANVAS){
|
|
}elif (ui->Type == _LA_UI_CANVAS){
|
|
if(!(ui->Flags&LA_UI_FLAGS_NO_OVERLAY)){
|
|
if(!(ui->Flags&LA_UI_FLAGS_NO_OVERLAY)){
|
|
for (sub = ui->Subs.pFirst; sub; sub = sub->Item.pNext){
|
|
for (sub = ui->Subs.pFirst; sub; sub = sub->Item.pNext){
|