summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-09 18:25:47 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-23 13:04:12 +0900
commitcb172de3dae148c0722b8d7d09aff6af57268637 (patch)
tree2e3e2c0094df36e7bc27a784ca04e1a0a376b36f /data
parentb2dbf9d9dd52d286e357e988ba55023b7eb9cb13 (diff)
win: Move main menu to the border edje group
The main menu can now be contained inside the CSD border rather than inside the win edje group.
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/border.edc45
1 files changed, 44 insertions, 1 deletions
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index fff5a31..eb9584e 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -837,11 +837,44 @@ group { name: "elm/border/base/default";
837 /* visible: 0; */ 837 /* visible: 0; */
838 /* } */ 838 /* } */
839 } 839 }
840 /* main menu */
841 rect { "menu_bg";
842 desc { "default";
843 color: 64 64 64 255; // FIXME color_class
844 align: 0.5 0.0;
845 rel.to: "elm.swallow.menu";
846 }
847 }
848 swallow { "elm.swallow.menu";
849 required: 1; // since 1.19
850 desc { "default";
851 rel.to: "top";
852 rel1.relative: 0.0 1.0;
853 rel1.offset: 0 -1;
854 visible: 0;
855 align: 0.5 0.0;
856 fixed: 1 1;
857 }
858 desc { "visible"; inherit: "default";
859 visible: 1;
860 fixed: 0 1;
861 }
862 }
863 /* covers the entire client contents, including the main menu */
864 spacer { "elm.spacer.content";
865 required: 1; // since 1.19
866 desc {
867 rel1.to: "top";
868 rel1.relative: 0.0 1.0;
869 rel2.to: "bottom";
870 rel2.relative: 1.0 0.0;
871 }
872 }
840 part { name: "elm.swallow.client"; type: SWALLOW; 873 part { name: "elm.swallow.client"; type: SWALLOW;
841 clip_to: "client_clip"; 874 clip_to: "client_clip";
842 description { state: "default" 0.0; 875 description { state: "default" 0.0;
843 rel1.relative: 0.0 1.0; 876 rel1.relative: 0.0 1.0;
844 rel1.to: "top"; 877 rel1.to: "elm.swallow.menu";
845 rel2.relative: 1.0 0.0; 878 rel2.relative: 1.0 0.0;
846 rel2.to: "bottom"; 879 rel2.to: "bottom";
847 } 880 }
@@ -1498,6 +1531,16 @@ group { name: "elm/border/base/default";
1498 target: "elm.event.resize.b"; 1531 target: "elm.event.resize.b";
1499 target: "elm.event.resize.br"; 1532 target: "elm.event.resize.br";
1500 } 1533 }
1534 program { name: "show_menu";
1535 signal: "elm,action,show_menu"; source: "elm";
1536 action: STATE_SET "visible" 0.0;
1537 target: "elm.swallow.menu";
1538 }
1539 program { name: "hide_menu";
1540 signal: "elm,action,hide"; source: "elm";
1541 action: STATE_SET "default" 0.0;
1542 target: "elm.swallow.menu";
1543 }
1501 program { 1544 program {
1502 signal: "mouse,down,*"; source: "elm.event.close"; 1545 signal: "mouse,down,*"; source: "elm.event.close";
1503 action: STATE_SET "selected" 0.0; 1546 action: STATE_SET "selected" 0.0;