summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-22 20:29:58 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-23 13:04:13 +0900
commit0fc049a3212b5a3199c380ea07e1afc03be98e2b (patch)
tree03971d3be56a7fe3dd4a0641f7815cdd87cb98f6 /data
parent60308d74218bbb3919b6359cb5ce44ed682ed288 (diff)
win: Move modal blocker to border group
Legacy themes are still supported with a fallback code.
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/colorclasses.edc4
-rw-r--r--data/elementary/themes/edc/elm/border.edc36
-rw-r--r--data/elementary/themes/edc/elm/win.edc30
3 files changed, 42 insertions, 28 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index f273d34..5c2a572 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -390,6 +390,10 @@ color_classes {
390 color: 64 64 64 255; 390 color: 64 64 64 255;
391 desc: "Background color of a standard window"; 391 desc: "Background color of a standard window";
392 } 392 }
393 color_class { "elm/win/blocker";
394 color: 32 32 32 128;
395 desc: "Overlay color for windows with modal children (blocked)";
396 }
393 397
394// modules 398// modules
395 color_class { name: "module_label"; 399 color_class { name: "module_label";
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 481dc93..5b2b6bc 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -114,6 +114,7 @@ group { name: "elm/border/base/default";
114 fixed: 0 1; 114 fixed: 0 1;
115 } 115 }
116 } 116 }
117
117 /* application contents - spacer and clipper (without main menu) */ 118 /* application contents - spacer and clipper (without main menu) */
118 spacer { "client_spacer"; 119 spacer { "client_spacer";
119 desc { "default"; 120 desc { "default";
@@ -129,6 +130,7 @@ group { name: "elm/border/base/default";
129 rel.to: "client_spacer"; 130 rel.to: "client_spacer";
130 } 131 }
131 } 132 }
133
132 /* application contents */ 134 /* application contents */
133 swallow { "elm.swallow.client"; 135 swallow { "elm.swallow.client";
134 clip: "client_clip"; 136 clip: "client_clip";
@@ -136,6 +138,26 @@ group { name: "elm/border/base/default";
136 rel.to: "client_spacer"; 138 rel.to: "client_spacer";
137 } 139 }
138 } 140 }
141
142 /* modal window blocker */
143 rect { "elm.rect.blocker";
144 required;
145 desc { "default";
146 rel1.to: "top_clip";
147 rel1.relative: 0.0 1.0;
148 rel2.to: "bottom_clip";
149 rel2.relative: 1.0 0.0;
150 color: 0 0 0 0;
151 hid;
152 }
153 desc { "visible";
154 inherit: "default";
155 color_class: "elm/win/blocker";
156 color: 255 255 255 255;
157 vis;
158 }
159 }
160
139 /* top title bar - spacer and clipper */ 161 /* top title bar - spacer and clipper */
140 rect { "top_clip"; //nomouse; 162 rect { "top_clip"; //nomouse;
141 desc { "default"; 163 desc { "default";
@@ -793,6 +815,20 @@ group { name: "elm/border/base/default";
793 target: "elm.swallow.menu"; 815 target: "elm.swallow.menu";
794 } 816 }
795 817
818 /* modal windows */
819 program { name: "hide_blocker";
820 signal: "elm,action,hide_blocker"; source: "elm";
821 action: STATE_SET "default" 0.0;
822 target: "elm.rect.blocker";
823 transition: DECELERATE 0.2;
824 }
825 program { name: "show_blocker";
826 signal: "elm,action,show_blocker"; source: "elm";
827 action: STATE_SET "visible" 0.0;
828 target: "elm.rect.blocker";
829 transition: DECELERATE 0.2;
830 }
831
796 /* minimize, maximize & close buttons */ 832 /* minimize, maximize & close buttons */
797 program { 833 program {
798 signal: "mouse,down,*"; source: "elm.event.close"; 834 signal: "mouse,down,*"; source: "elm.event.close";
diff --git a/data/elementary/themes/edc/elm/win.edc b/data/elementary/themes/edc/elm/win.edc
index 44ae634..8c6a08d 100644
--- a/data/elementary/themes/edc/elm/win.edc
+++ b/data/elementary/themes/edc/elm/win.edc
@@ -1,39 +1,13 @@
1group { name: "elm/win/base/default"; 1group { name: "elm/win/base/default";
2 data.item: "elm_win_version" "119";
2 parts { 3 parts {
3 rect { "client_clip"; nomouse; 4 rect { "client_clip"; nomouse;
4 desc { "default"; 5 desc { "default";
5 rel1.to_y: "elm.swallow.contents"; 6 rel.to: "elm.swallow.contents";
6 rel2.to_y: "elm.swallow.contents";
7 } 7 }
8 } 8 }
9 swallow { "elm.swallow.contents"; 9 swallow { "elm.swallow.contents";
10 clip_to: "client_clip"; 10 clip_to: "client_clip";
11 } 11 }
12 rect { "blocker";
13 desc { "default";
14 rel1.relative : 0.0 0.0;
15 rel2.relative : 1.0 1.0;
16 color: 64 64 64 150;
17 visible: 0;
18 }
19 desc { "visible";
20 inherit: "default";
21 visible: 1;
22 }
23 }
24 }
25 programs {
26 program { name: "hide_blocker";
27 signal: "elm,action,hide_blocker";
28 source: "elm";
29 action: STATE_SET "default" 0.0;
30 target: "blocker";
31 }
32 program { name: "show_blocker";
33 signal: "elm,action,show_blocker";
34 source: "elm";
35 action: STATE_SET "visible" 0.0;
36 target: "blocker";
37 }
38 } 12 }
39} 13}