summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-28 17:24:18 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-29 16:36:05 +0900
commitc7f2308e6c12181d06b5904d46a5d2b6c463f5c8 (patch)
treeef60f731d0dc9a7f46b798501ade7db1068e7fa7 /data
parentf927169a10f805afa26d10b0eba9b6d48adfaaaa (diff)
Revert "win: Move main menu back to win.edc (fix sizing)"
This reverts commit 8a213847596376305d282e1ba26080b548a207f9. The following commit will reintroduce the menu slot inside the border edc.
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/border.edc43
-rw-r--r--data/elementary/themes/edc/elm/win.edc40
2 files changed, 38 insertions, 45 deletions
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 72e84ab..1c5a25d 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -1,12 +1,10 @@
1/* Window client-side decorations and extra slots 1/* Window client-side decorations and extra slots
2 * Includes swallows for: 2 * Includes swallows for:
3 * - app content 3 * - app content
4 * - main menu
4 * - indicator 5 * - indicator
5 * - soft key 6 * - soft key
6 * - virtual keyboard 7 * - virtual keyboard
7 *
8 * Not included:
9 * - main menu (sizing issues - needs rework of the menu itself)
10 */ 8 */
11 9
12group { name: "elm/border/base/default"; 10group { name: "elm/border/base/default";
@@ -93,11 +91,34 @@ group { name: "elm/border/base/default";
93 required; // @since 1.19 91 required; // @since 1.19
94 clip: "client_clip"; 92 clip: "client_clip";
95 } 93 }
94 /* main menu */
95 rect { "menu_bg";
96 desc { "default";
97 color: 64 64 64 255; // FIXME: color_class
98 align: 0.5 0.0;
99 rel.to: "elm.swallow.menu";
100 }
101 }
102 swallow { "elm.swallow.menu";
103 required: 1; // since 1.19
104 desc { "default";
105 rel.to: "top_clip";
106 rel1.relative: 0.0 1.0;
107 rel1.offset: 0 -1;
108 visible: 0;
109 align: 0.5 0.0;
110 fixed: 1 1;
111 }
112 desc { "visible"; inherit: "default";
113 visible: 1;
114 fixed: 0 1;
115 }
116 }
96 117
97 /* application contents - spacer and clipper */ 118 /* application contents - spacer and clipper (without main menu) */
98 spacer { "client_spacer"; 119 spacer { "client_spacer";
99 desc { "default"; 120 desc { "default";
100 rel1.to: "top_clip"; 121 rel1.to: "elm.swallow.menu";
101 rel1.relative: 0.0 1.0; 122 rel1.relative: 0.0 1.0;
102 rel2.to: "bottom_clip"; 123 rel2.to: "bottom_clip";
103 rel2.relative: 1.0 0.0; 124 rel2.relative: 1.0 0.0;
@@ -784,6 +805,18 @@ group { name: "elm/border/base/default";
784 UNSET_MODE(MAXIMIZED); 805 UNSET_MODE(MAXIMIZED);
785 } 806 }
786 807
808 /* application desktop menu */
809 program { name: "show_menu";
810 signal: "elm,action,show_menu"; source: "elm";
811 action: STATE_SET "visible";
812 target: "elm.swallow.menu";
813 }
814 program { name: "hide_menu";
815 signal: "elm,action,hide"; source: "elm";
816 action: STATE_SET "default";
817 target: "elm.swallow.menu";
818 }
819
787 /* modal windows */ 820 /* modal windows */
788 program { name: "hide_blocker"; 821 program { name: "hide_blocker";
789 signal: "elm,action,hide_blocker"; source: "elm"; 822 signal: "elm,action,hide_blocker"; source: "elm";
diff --git a/data/elementary/themes/edc/elm/win.edc b/data/elementary/themes/edc/elm/win.edc
index 2c5e0dd..8c6a08d 100644
--- a/data/elementary/themes/edc/elm/win.edc
+++ b/data/elementary/themes/edc/elm/win.edc
@@ -1,28 +1,6 @@
1group { name: "elm/win/base/default"; 1group { name: "elm/win/base/default";
2 data.item: "elm_win_version" "119"; 2 data.item: "elm_win_version" "119";
3 parts { 3 parts {
4 /* main menu */
5 part { name: "menu_bg"; type: RECT;
6 description { state: "default" 0.0;
7 color: 64 64 64 255;
8 align: 0.5 0;
9 rel2.to: "elm.swallow.menu";
10 }
11 }
12 part { name: "elm.swallow.menu"; type: SWALLOW;
13 description { state: "default" 0.0;
14 rel2.relative: 1.0 0.0;
15 visible: 0;
16 align: 0.5 0;
17 fixed: 1 1;
18 }
19 description { state: "visible" 0.0;
20 inherit: "default" 0.0;
21 visible: 1;
22 fixed: 0 1;
23 }
24 }
25 /* application content */
26 rect { "client_clip"; nomouse; 4 rect { "client_clip"; nomouse;
27 desc { "default"; 5 desc { "default";
28 rel.to: "elm.swallow.contents"; 6 rel.to: "elm.swallow.contents";
@@ -30,24 +8,6 @@ group { name: "elm/win/base/default";
30 } 8 }
31 swallow { "elm.swallow.contents"; 9 swallow { "elm.swallow.contents";
32 clip_to: "client_clip"; 10 clip_to: "client_clip";
33 desc { "default";
34 rel1.to: "elm.swallow.menu";
35 rel1.relative: 0.0 1.0;
36 }
37 }
38 }
39 programs {
40 program { name: "show_menu";
41 signal: "elm,action,show_menu";
42 source: "elm";
43 action: STATE_SET "visible" 0.0;
44 target: "elm.swallow.menu";
45 }
46 program { name: "hide_menu";
47 signal: "elm,action,hide";
48 source: "elm";
49 action: STATE_SET "default" 0.0;
50 target: "elm.swallow.menu";
51 } 11 }
52 } 12 }
53} 13}