summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-20 13:14:29 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-20 13:14:29 +0100
commit244c87402181e5beaf1c5ab4cea1ea061a52bf1f (patch)
tree0d94c999b458c25b8afdb70479e2a1318ab75870 /data/elementary/themes
parenteef252119ec7385adffaac20076c725b2a1d0066 (diff)
TH - main win menu fixes
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/edc/elm/border.edc14
-rw-r--r--data/elementary/themes/edc/elm/win.edc7
2 files changed, 12 insertions, 9 deletions
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 680c50f1a5..109f12e7a0 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -28,12 +28,6 @@ group { name: "elm/border/base/default";
28 new m_show = get_int(show_menu); 28 new m_show = get_int(show_menu);
29 new s_hide = get_int(hide_shadow); 29 new s_hide = get_int(hide_shadow);
30 30
31 if ((m_show) && (s_hide)) {
32 set_state(PART:"elm.swallow.menu", "visible", 0.0);
33 } else {
34 set_state(PART:"elm.swallow.menu", "default", 0.0);
35 }
36
37 if (s_hide) { 31 if (s_hide) {
38 set_state(PART:"shadow_clip", "hidden", 0.0); 32 set_state(PART:"shadow_clip", "hidden", 0.0);
39 set_state(PART:"shadow_base", "hidden", 0.0); 33 set_state(PART:"shadow_base", "hidden", 0.0);
@@ -41,6 +35,11 @@ group { name: "elm/border/base/default";
41 set_state(PART:"shadow_clip", "default", 0.0); 35 set_state(PART:"shadow_clip", "default", 0.0);
42 set_state(PART:"shadow_base", "default", 0.0); 36 set_state(PART:"shadow_base", "default", 0.0);
43 } 37 }
38 if ((m_show)/* && (s_hide)*/) {
39 set_state(PART:"elm.swallow.menu", "visible", 0.0);
40 } else {
41 set_state(PART:"elm.swallow.menu", "default", 0.0);
42 }
44 } 43 }
45 44
46 public border_mode; 45 public border_mode;
@@ -150,7 +149,8 @@ group { name: "elm/border/base/default";
150 fixed: 1 1; 149 fixed: 1 1;
151 rel1.relative: 0.0 1.0; 150 rel1.relative: 0.0 1.0;
152 rel1.offset: 0 -1; 151 rel1.offset: 0 -1;
153min: 0 40; 152// debug...
153//min: 0 40;
154 } 154 }
155 desc { "visible"; inherit: "default"; 155 desc { "visible"; inherit: "default";
156 // GGGG 156 // GGGG
diff --git a/data/elementary/themes/edc/elm/win.edc b/data/elementary/themes/edc/elm/win.edc
index 0e95dc6bb4..364b744b3e 100644
--- a/data/elementary/themes/edc/elm/win.edc
+++ b/data/elementary/themes/edc/elm/win.edc
@@ -2,19 +2,22 @@ group { name: "elm/win/base/default";
2 data.item: "version" "119"; 2 data.item: "version" "119";
3 parts { 3 parts {
4 rect { "client_clip"; nomouse; } 4 rect { "client_clip"; nomouse; }
5// nothing seems to use this swallow...
5 swallow { "elm.swallow.menu"; 6 swallow { "elm.swallow.menu";
6 clip_to: "client_clip"; 7 clip_to: "client_clip";
7 desc { "default"; 8 desc { "default";
8 rel2.relative: 1 0; 9 rel2.relative: 1 0;
9 link.base: "elm,action,hide" "elm";
10 align: 0.5 0.0; 10 align: 0.5 0.0;
11 hid; 11 hid;
12 link.base: "elm,action,hide" "elm";
13 min: 0 80;
12 } 14 }
13 desc { "visible"; 15 desc { "visible";
14 inherit: "default"; 16 inherit: "default";
15 link.base: "elm,action,show_menu" "elm"; 17 align: 0.5 0.0;
16 fixed: 0 1; 18 fixed: 0 1;
17 vis; 19 vis;
20 link.base: "elm,action,show_menu" "elm";
18 } 21 }
19 } 22 }
20 swallow { "elm.swallow.contents"; 23 swallow { "elm.swallow.contents";