summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-28 18:26:39 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-29 16:36:29 +0900
commit1f9dfe2ed374bd54dd84aaf70abb496b021269cb (patch)
treeaecccf0b1781ea6152115e41ef285e43f3106fcc /data
parentc7f2308e6c12181d06b5904d46a5d2b6c463f5c8 (diff)
win: Move main menu to the framespace
After reverting 8a213847596376305d282e1, I figured out how to move the main menu back to the border group. This time the menu is in the framespace and its layout algos have been adapted to allow non-zero root coordinates.
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/border.edc5
-rw-r--r--data/elementary/themes/edc/elm/menu.edc1
2 files changed, 3 insertions, 3 deletions
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 1c5a25d..24a942f 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -39,11 +39,11 @@ group { name: "elm/border/base/default";
39 } 39 }
40 desc { "max"; inherit: "default"; } 40 desc { "max"; inherit: "default"; }
41 } 41 }
42 /* covers the entire client contents, including the main menu */ 42 /* covers the entire client contents, excluding the main menu */
43 spacer { "elm.spacer.content"; 43 spacer { "elm.spacer.content";
44 required; // since 1.19 44 required; // since 1.19
45 desc { 45 desc {
46 rel1.to: "top_clip"; 46 rel1.to: "elm.swallow.menu";
47 rel1.relative: 0.0 1.0; 47 rel1.relative: 0.0 1.0;
48 rel2.to: "bottom_clip"; 48 rel2.to: "bottom_clip";
49 rel2.relative: 1.0 0.0; 49 rel2.relative: 1.0 0.0;
@@ -104,7 +104,6 @@ group { name: "elm/border/base/default";
104 desc { "default"; 104 desc { "default";
105 rel.to: "top_clip"; 105 rel.to: "top_clip";
106 rel1.relative: 0.0 1.0; 106 rel1.relative: 0.0 1.0;
107 rel1.offset: 0 -1;
108 visible: 0; 107 visible: 0;
109 align: 0.5 0.0; 108 align: 0.5 0.0;
110 fixed: 1 1; 109 fixed: 1 1;
diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc
index c4c510e..ec3d67b 100644
--- a/data/elementary/themes/edc/elm/menu.edc
+++ b/data/elementary/themes/edc/elm/menu.edc
@@ -761,6 +761,7 @@ group { name: "elm/hover/base/menu/default";
761 part { name: "bottomclip"; type: RECT; 761 part { name: "bottomclip"; type: RECT;
762 description { state: "default" 0.0; 762 description { state: "default" 0.0;
763 color: 255 255 255 0; 763 color: 255 255 255 0;
764 rel1.offset: 0 -7;
764 } 765 }
765 description { state: "visible" 0.0; 766 description { state: "visible" 0.0;
766 inherit: "default" 0.0; 767 inherit: "default" 0.0;