From 6ebaf3ac82c315a38a86890f901dd8df1860314f Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Thu, 10 Feb 2022 23:10:55 +0000
Subject: [PATCH] gui: simplify panel styles

---
 apps/system_monitor.cpp |   3 ++-
 desktop/os.header       |  13 +++++++++++++
 res/Theme Source.dat    | Bin 531228 -> 530988 bytes
 res/Theme.dat           | Bin 31932 -> 31932 bytes
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/system_monitor.cpp b/apps/system_monitor.cpp
index 083aa5d..23e4353 100644
--- a/apps/system_monitor.cpp
+++ b/apps/system_monitor.cpp
@@ -46,7 +46,8 @@ const EsStyle stylePanelMemoryStatistics = {
 	.inherit = ES_STYLE_PANEL_FILLED,
 
 	.metrics = {
-		.mask = ES_THEME_METRICS_GAP_ALL,
+		.mask = ES_THEME_METRICS_INSETS | ES_THEME_METRICS_GAP_ALL,
+		.insets = ES_RECT_1(8),
 		.gapMajor = 5,
 		.gapMinor = 5,
 	},
diff --git a/desktop/os.header b/desktop/os.header
index 2a12cfb..180af1b 100644
--- a/desktop/os.header
+++ b/desktop/os.header
@@ -2528,6 +2528,19 @@ function void EsSliderSetValue(EsSlider *slider, double newValue, bool sendUpdat
 
 // Panels, spacers and splitters.
 
+// Styles for panels:
+//	Visual:
+// 		ES_STYLE_PANEL_DOCUMENT - same background color as textbox - use to contain textual content
+//		ES_STYLE_PANEL_FILLED - same background color as window - use to contain a page of controls
+//		ES_STYLE_PANEL_INSET, ES_STYLE_PANEL_GROUP_BOX, ES_STYLE_PANEL_SHEET - use for grouping controls
+//	Layout:
+//		ES_STYLE_PANEL_FORM_TABLE - use for laying out controls in a table
+//		ES_STYLE_PANEL_POPUP - use for laying out controls in a menu popup
+//	Root level (the root panel/splitter should be one of these):
+//		ES_STYLE_PANEL_WINDOW_DIVIDER - does not give the window a background color
+//		ES_STYLE_PANEL_WINDOW_BACKGROUND - gives the window a background color, same as ES_STYLE_PANEL_FILLED
+//		ES_STYLE_PANEL_WINDOW_WITH_STATUS_BAR_CONTENT - alternate version of ES_STYLE_PANEL_WINDOW_DIVIDER if the window has a status bar
+
 function EsPanel *EsPanelCreate(EsElement *parent, uint64_t flags = ES_FLAGS_DEFAULT, EsStyleID style = 0);
 function EsSpacer *EsSpacerCreate(EsElement *parent, uint64_t flags = ES_FLAGS_DEFAULT, EsStyleID style = 0, int width = 0, int height = 0);
 function EsSplitter *EsSplitterCreate(EsElement *parent, uint64_t flags = ES_FLAGS_DEFAULT, EsStyleID style = 0);
diff --git a/res/Theme Source.dat b/res/Theme Source.dat
index d5ac4feab1e0fab2ae4eb03eff8b57163816aa86..6908a4485f71915aeb58f022e20bf968e70b6757 100644
GIT binary patch
delta 216
zcmbQUO<~Ozg@zW!7N!>FEi5%_rWa(e@NbvD$tcJ?z2G;a#`HH^St2GM5Hr~Bvw`I|
zI}>B<_K9sQ!c5ZxG+6|;KlsaXfpPkW{SYP7*BoHs*nVaYiw+;7#N@&=v!{R9!5RP}
z_$TLENKXH-jFoG<o-}Je<Mf&LSoEf!Kf&ZUeZnOc&gokhvCQ9Ya-QXm6r;p;!B;G6
zn2=N?`~<3CUC%Oq@)Lc7=?^@aIi}y>V9{yc@QwwDS%H{s`-XSy_S)0?B{?{^|B&QR
GVFUmy|5!`_

delta 265
zcmZ3pMPbf1g@zW!7N!>FEi5%_rd6>9Ob=jX(O`_&{_!`<d8X-awz5P_J|JeW-Dd;K
zZ}#c&M_4$g&uC*=0#o^6@&Q-Q&AKP9Gfpq~&8RW`!+wbR>1z(KaBM%bhed~P`hqr=
zIn#Eq1^_Yt<a`UsY0Fr-w%bXuu49~jK$ekn`rJ3n@?h5Fm*3^5HymZ;n!M`XG>CaU
zSD^O4Imfa_3St!0kzlJQ>z;T%`N4Od={`%CU4RVE$t&+ohiEPM0d>j)PiBtkH#k^y
b+7G;C0b*7lX4`(?ExWxoBjYwn4jo1S1wL^@

diff --git a/res/Theme.dat b/res/Theme.dat
index 3831baac5b29e092424c01e20eda93e762b1f55b..8f50ef7973c3e25f331c421d74f4982648a6bb77 100644
GIT binary patch
delta 59
zcmdn<lX1^a#tmOQCnuO|PcG2po!p?wGugt+0m!$Q{D6;V@*b}}lOMRMY@Xxo!Z^9X
NTmmGxnZ<X9J^%#C7+wGX

delta 67
zcmdn<lX1^a#tmOQCm--(V~m)*-&|#KfhO<d22GyH7G4fOQH#k9!aS4rc<o_jVF1F(
Wf&B8D=Xkp?PX3^&vYEwqhduzIx)}BV