From 16bcc56652c0d2d0987ff5736215eb1932625c42 Mon Sep 17 00:00:00 2001 From: nakst <> Date: Sun, 10 Oct 2021 18:57:02 +0100 Subject: [PATCH] theme file cleanup --- desktop/gui.cpp | 4 ++-- desktop/styles.header | 2 -- res/Theme Source.dat | Bin 506572 -> 500084 bytes res/Theme.dat | Bin 29268 -> 28956 bytes 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/gui.cpp b/desktop/gui.cpp index 7d761fd..227b299 100644 --- a/desktop/gui.cpp +++ b/desktop/gui.cpp @@ -931,8 +931,8 @@ EsWindow *EsWindowCreate(EsInstance *instance, EsWindowStyle style) { window->state |= UI_STATE_Z_STACK; } else if (style == ES_WINDOW_INSPECTOR) { EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, ES_WINDOW_SOLID_TRUE, 0, ES_WINDOW_PROPERTY_SOLID); - window->SetStyle(ES_STYLE_PANEL_INSPECTOR_WINDOW_ROOT); - window->mainPanel = EsPanelCreate(window, ES_ELEMENT_NON_CLIENT | ES_CELL_FILL, ES_STYLE_PANEL_INSPECTOR_WINDOW_CONTAINER); + window->SetStyle(ES_STYLE_PANEL_FILLED); + window->mainPanel = EsPanelCreate(window, ES_ELEMENT_NON_CLIENT | ES_CELL_FILL); EsRectangle bounds = { 10, 600, 10, 500 }; EsSyscall(ES_SYSCALL_WINDOW_MOVE, window->handle, (uintptr_t) &bounds, 0, ES_WINDOW_MOVE_ADJUST_TO_FIT_SCREEN); } else if (style == ES_WINDOW_TIP || style == ES_WINDOW_PLAIN) { diff --git a/desktop/styles.header b/desktop/styles.header index 980f2ce..bfb943f 100644 --- a/desktop/styles.header +++ b/desktop/styles.header @@ -81,8 +81,6 @@ define ES_STYLE_PANEL_FILLED (ES_STYLE_CAST(1313)) define ES_STYLE_PANEL_FORM_TABLE (ES_STYLE_CAST(1671)) define ES_STYLE_PANEL_GROUP_BOX (ES_STYLE_CAST(1315)) define ES_STYLE_PANEL_INSET (ES_STYLE_CAST(1641)) -private define ES_STYLE_PANEL_INSPECTOR_WINDOW_CONTAINER (ES_STYLE_CAST(1317)) -private define ES_STYLE_PANEL_INSPECTOR_WINDOW_ROOT (ES_STYLE_CAST(1319)) define ES_STYLE_PANEL_POPUP (ES_STYLE_CAST(1331)) define ES_STYLE_PANEL_SHEET (ES_STYLE_CAST(1333)) private define ES_STYLE_PANEL_SHUTDOWN_OVERLAY (ES_STYLE_CAST(1335)) diff --git a/res/Theme Source.dat b/res/Theme Source.dat index 97d79232fdecaf487344c9721cef37462879c81a..e14530b2d1100c5f98557753005bde20c657df69 100644 GIT binary patch delta 3945 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 KAC!49TkwAyGCa2c delta 6019 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