From 244c87402181e5beaf1c5ab4cea1ea061a52bf1f Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Mon, 20 Jul 2020 13:14:29 +0100
Subject: [PATCH] TH - main win menu fixes

---
 data/elementary/themes/edc/elm/border.edc | 14 +++++++-------
 data/elementary/themes/edc/elm/win.edc    |  7 +++++--
 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";
          new m_show = get_int(show_menu);
          new s_hide = get_int(hide_shadow);
 
-         if ((m_show) && (s_hide)) {
-            set_state(PART:"elm.swallow.menu", "visible", 0.0);
-         } else {
-            set_state(PART:"elm.swallow.menu", "default", 0.0);
-         }
-
          if (s_hide) {
             set_state(PART:"shadow_clip", "hidden", 0.0);
             set_state(PART:"shadow_base", "hidden", 0.0);
@@ -41,6 +35,11 @@ group { name: "elm/border/base/default";
             set_state(PART:"shadow_clip", "default", 0.0);
             set_state(PART:"shadow_base", "default", 0.0);
          }
+         if ((m_show)/* && (s_hide)*/) {
+            set_state(PART:"elm.swallow.menu", "visible", 0.0);
+         } else {
+            set_state(PART:"elm.swallow.menu", "default", 0.0);
+         }
       }
 
       public border_mode;
@@ -150,7 +149,8 @@ group { name: "elm/border/base/default";
             fixed: 1 1;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
-min:  0 40;
+// debug...
+//min:  0 40;
          }
          desc { "visible"; inherit: "default";
             // 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";
    data.item: "version" "119";
    parts {
       rect { "client_clip"; nomouse; }
+// nothing seems to use this swallow...
       swallow { "elm.swallow.menu";
          clip_to: "client_clip";
          desc { "default";
             rel2.relative: 1 0;
-            link.base: "elm,action,hide" "elm";
             align: 0.5 0.0;
             hid;
+            link.base: "elm,action,hide" "elm";
+            min: 0 80;
          }
          desc { "visible";
             inherit: "default";
-            link.base: "elm,action,show_menu" "elm";
+            align: 0.5 0.0;
             fixed: 0 1;
             vis;
+            link.base: "elm,action,show_menu" "elm";
          }
       }
       swallow { "elm.swallow.contents";