Elm: Add border edc & images for wayland borders.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66766 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 9c4bef6..bfc848d 100644 (file)
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -18,6 +18,7 @@ widgets/fileselector.edc \
 widgets/menu.edc \
 widgets/segment_control.edc \
 widgets/bg.edc \
+widgets/border.edc \
 widgets/flipselector.edc \
 widgets/naviframe.edc \
 widgets/multibuttonentry.edc \
@@ -65,6 +66,21 @@ ews.edc \
 arrow_down.png \
 arrow_up.png \
 bar_shine.png \
+bd_bottom.png \
+bd_button_close_focused.png \
+bd_button_close_shadow.png \
+bd_button_close_unfocused.png \
+bd_button_max_focused.png \
+bd_button_max_shadow.png \
+bd_button_max_unfocused.png \
+bd_button_min_focused.png \
+bd_button_min_shadow.png \
+bd_button_min_unfocused.png \
+bd_resize_b.png \
+bd_title_bg.png \
+bd_title_over.png \
+bd_top_hilight.png \
+bd_top.png \
 bt_base1.png \
 bt_base2.png \
 bt_bases.png \
@@ -86,6 +102,7 @@ ctxpopup_arrow_up.png \
 dia_botshad.png \
 dia_grad.png \
 dia_topshad.png \
+exclam.png \
 frame_1.png \
 frame_2.png \
 flip_0b.png \

diff --git a/data/themes/bd_bottom.png b/data/themes/bd_bottom.png
new file mode 100644 (file)
index 0000000..46b9a48
Binary files /dev/null and b/data/themes/bd_bottom.png differ

diff --git a/data/themes/bd_button_close_focused.png b/data/themes/bd_button_close_focused.png
new file mode 100644 (file)
index 0000000..281427e
Binary files /dev/null and b/data/themes/bd_button_close_focused.png differ

diff --git a/data/themes/bd_button_close_shadow.png b/data/themes/bd_button_close_shadow.png
new file mode 100644 (file)
index 0000000..91a1955
Binary files /dev/null and b/data/themes/bd_button_close_shadow.png differ

diff --git a/data/themes/bd_button_close_unfocused.png b/data/themes/bd_button_close_unfocused.png
new file mode 100644 (file)
index 0000000..8382d7f
Binary files /dev/null and b/data/themes/bd_button_close_unfocused.png differ

diff --git a/data/themes/bd_button_max_focused.png b/data/themes/bd_button_max_focused.png
new file mode 100644 (file)
index 0000000..36a8239
Binary files /dev/null and b/data/themes/bd_button_max_focused.png differ

diff --git a/data/themes/bd_button_max_shadow.png b/data/themes/bd_button_max_shadow.png
new file mode 100644 (file)
index 0000000..e7362db
Binary files /dev/null and b/data/themes/bd_button_max_shadow.png differ

diff --git a/data/themes/bd_button_max_unfocused.png b/data/themes/bd_button_max_unfocused.png
new file mode 100644 (file)
index 0000000..e0dc5da
Binary files /dev/null and b/data/themes/bd_button_max_unfocused.png differ

diff --git a/data/themes/bd_button_min_focused.png b/data/themes/bd_button_min_focused.png
new file mode 100644 (file)
index 0000000..e487755
Binary files /dev/null and b/data/themes/bd_button_min_focused.png differ

diff --git a/data/themes/bd_button_min_shadow.png b/data/themes/bd_button_min_shadow.png
new file mode 100644 (file)
index 0000000..36349c8
Binary files /dev/null and b/data/themes/bd_button_min_shadow.png differ

diff --git a/data/themes/bd_button_min_unfocused.png b/data/themes/bd_button_min_unfocused.png
new file mode 100644 (file)
index 0000000..58cbb05
Binary files /dev/null and b/data/themes/bd_button_min_unfocused.png differ

diff --git a/data/themes/bd_resize_b.png b/data/themes/bd_resize_b.png
new file mode 100644 (file)
index 0000000..74c9432
Binary files /dev/null and b/data/themes/bd_resize_b.png differ

diff --git a/data/themes/bd_title_bg.png b/data/themes/bd_title_bg.png
new file mode 100644 (file)
index 0000000..2b2686b
Binary files /dev/null and b/data/themes/bd_title_bg.png differ

diff --git a/data/themes/bd_title_over.png b/data/themes/bd_title_over.png
new file mode 100644 (file)
index 0000000..6dd6efb
Binary files /dev/null and b/data/themes/bd_title_over.png differ

diff --git a/data/themes/bd_top.png b/data/themes/bd_top.png
new file mode 100644 (file)
index 0000000..f7fbebf
Binary files /dev/null and b/data/themes/bd_top.png differ

diff --git a/data/themes/bd_top_hilight.png b/data/themes/bd_top_hilight.png
new file mode 100644 (file)
index 0000000..0c5bf55
Binary files /dev/null and b/data/themes/bd_top_hilight.png differ

diff --git a/data/themes/default.edc b/data/themes/default.edc
index f93a2f6..09361ba 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -318,6 +318,7 @@ collections {
    }
 
 #include "widgets/bg.edc"
+#include "widgets/border.edc"
 #include "widgets/scroller.edc"
 #include "widgets/label.edc"
 #include "widgets/button.edc"

diff --git a/data/themes/exclam.png b/data/themes/exclam.png
new file mode 100644 (file)
index 0000000..02068e2
Binary files /dev/null and b/data/themes/exclam.png differ

diff --git a/data/themes/widgets/border.edc b/data/themes/widgets/border.edc
new file mode 100644 (file)
index 0000000..1bf1304
--- /dev/null
+++ b/data/themes/widgets/border.edc
@@ -0,0 +1,550 @@
+color_classes {
+   color_class {
+      name: "border_top";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "border_top_hilight";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "border_bottom";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "border_title";
+      color: 0 0 0 255;
+   }
+   color_class {
+      name: "border_title_active";
+      color: 224 224 224 255;
+      color3: 0 0 0 64;
+   }
+}
+
+group {
+   name: "elm/border/base/default";
+   images {
+      image: "bd_top.png" COMP;
+      image: "bd_top_hilight.png" COMP;
+      image: "bd_bottom.png" COMP;
+      image: "bd_title_bg.png" COMP;
+      image: "bd_title_over.png" COMP;
+      image: "bd_resize_b.png" COMP;
+      image: "busy-1.png" COMP;
+      image: "busy-2.png" COMP;
+      image: "busy-3.png" COMP;
+      image: "busy-4.png" COMP;
+      image: "busy-5.png" COMP;
+      image: "busy-6.png" COMP;
+      image: "busy-7.png" COMP;
+      image: "busy-8.png" COMP;
+      image: "busy-9.png" COMP;
+      image: "exclam.png" COMP;
+      image: "bd_button_close_shadow.png" COMP;
+      image: "bd_button_close_focused.png" COMP;
+      image: "bd_button_close_unfocused.png" COMP;
+      image: "bd_button_max_shadow.png" COMP;
+      image: "bd_button_max_focused.png" COMP;
+      image: "bd_button_max_unfocused.png" COMP;
+      image: "bd_button_min_shadow.png" COMP;
+      image: "bd_button_min_focused.png" COMP;
+      image: "bd_button_min_unfocused.png" COMP;
+   }
+   parts {
+      part {
+         name: "top";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            rel2.to_y: "title_base";
+            image {
+               normal: "bd_top.png";
+               border: 2 2 2 2;
+            }
+         }
+      }
+      part {
+         name: "bottom";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            rel1 {
+               relative: 0.0 1.0;
+               offset: 0 -4;
+            }
+            image {
+               normal: "bd_bottom.png";
+               border: 2 2 0 0;
+            }
+         }
+         description {
+            state: "shaded" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description {
+            state: "max" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "icon_area";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            rel1.offset: 2 2;
+            rel2 {
+               relative: 0.0 1.0;
+               offset: 2 -3;
+               to_y: "title_base";
+            }
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 2 3;
+            rel2.offset: 2 -2;
+         }
+      }
+      part {
+         name: "icon_area2";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            rel1.to: "icon_area";
+            rel2.to: "icon_area";
+         }
+      }
+      part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         description {
+            state: "default" 0.0;
+            aspect: 1.0 1.0;
+            aspect_preference: BOTH;
+            rel1.to: "icon_area2";
+            rel2.to: "icon_area2";
+         }
+         description {
+            state: "shrunk" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.3 0.3;
+            rel2.relative: 0.7 0.7;
+         }
+      }
+      part {
+         name: "elm.text.title";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 1;
+            align: 0.0 0.0;
+            rel1 {
+               relative: 1.0 0.0;
+               offset: 9 2;
+               to_x: "icon_area";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               offset: -8 2;
+               to_x: "title_base";
+            }
+            text {
+               font: "Sans:style=Bold";
+               size: 10;
+               min: 0 1;
+               align: 0.0 0.0;
+               text_class: "title_base";
+            }
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "bt_close";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            align: 1.0 0.5;
+            min: 22 22;
+            max: 22 22;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            rel1 {
+               relative: 1.0 0.0;
+               offset: -2 1;
+               to: "top";
+            }
+            rel2 {
+               offset: -2 -2;
+               to: "top";
+            }
+            image.normal: "bd_button_close_shadow.png";
+         }
+      }
+      part {
+         name: "bt_max";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            align: 1.0 0.5;
+            min: 22 22;
+            max: 22 22;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            rel1 {
+               offset: -2 1;
+               to_x: "bt_close";
+               to_y: "top";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: -2 -2;
+               to_x: "bt_close";
+               to_y: "top";
+            }
+            image.normal: "bd_button_max_shadow.png";
+         }
+      }
+      part {
+         name: "bt_min";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            align: 1.0 0.5;
+            min: 22 22;
+            max: 22 22;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            rel1 {
+               offset: -2 1;
+               to_x: "bt_max";
+               to_y: "top";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: -2 -2;
+               to_x: "bt_max";
+               to_y: "top";
+            }
+            image.normal: "bd_button_min_shadow.png";
+         }
+      }
+      part {
+         name: "top_hilight";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            rel1.to: "top";
+            rel2 {
+               relative: 1.0 0.5;
+               offset: -1 0;
+               to: "top";
+            }
+            color_class: "border_top_hilight";
+            image.normal: "bd_top_hilight.png";
+            fill.smooth: 0;
+         }
+      }
+      part {
+         name: "buttons_unfoc";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+            color: 255 255 255 0;
+         }
+      }
+      part {
+         name: "bt_close_unfoc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_unfoc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_close";
+            rel2.to: "bt_close";
+            image.normal: "bd_button_close_unfocused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "bt_max_unfoc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_unfoc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_max";
+            rel2.to: "bt_max";
+            image.normal: "bd_button_max_unfocused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "bt_min_unfoc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_unfoc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_min";
+            rel2.to: "bt_min";
+            image.normal: "bd_button_min_unfocused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "buttons_foc";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            color: 255 255 255 0;
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+      }
+      part {
+         name: "bt_close_foc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_foc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_close";
+            rel2.to: "bt_close";
+            image.normal: "bd_button_close_focused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "bt_max_foc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_foc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_max";
+            rel2.to: "bt_max";
+            image.normal: "bd_button_max_focused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "bt_min_foc";
+         type: IMAGE;
+         mouse_events: 0;
+         clip_to: "buttons_foc";
+         description {
+            state: "default" 0.0;
+            rel1.to: "bt_min";
+            rel2.to: "bt_min";
+            image.normal: "bd_button_min_focused.png";
+         }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 1;
+            rel2.offset: -1 0;
+         }
+      }
+      part {
+         name: "title_base";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to_x: "icon_area";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: -3 4;
+               to_y: "elm.text.title";
+               to_x: "bt_min";
+            }
+         }
+      }
+      part {
+         name: "title_back";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            rel1.to: "title_base";
+            rel2 {
+               relative: 1.0 0.0;
+               to: "title_base";
+            }
+            image {
+               normal: "bd_title_bg.png";
+               border: 7 7 2 7;
+            }
+            fill.smooth: 0;
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel2 {
+               relative: 1.0 1.0;
+               to: "title_base";
+            }
+         }
+      }
+      part {
+         name: "title2";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         effect: SOFT_SHADOW;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            align: 0.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               offset: -1 0;
+               to_x: "elm.text.title";
+               to_y: "title_back";
+            }
+            rel2 {
+               offset: 0 0;
+               to_x: "elm.text.title";
+               to_y: "title_back";
+            }
+            color_class: "border_title_active";
+            text {
+               text_source: "elm.text.title";
+               font: "Sans:style=Bold";
+               size: 10;
+               align: 0.0 0.0;
+               min: 0 1;
+               text_class: "title_bar";
+            }
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "title_over";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            rel1.to: "title_back";
+            rel2.to: "title_back";
+            image {
+               normal: "bd_title_over.png";
+               border: 7 7 2 7;
+            }
+            fill.smooth: 0;
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "bottom_clip";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            rel1.to: "bottom";
+            rel2.to: "bottom";
+            color: 255 255 255 255;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "focus_in";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         transition: LINEAR 0.2;
+         target: "title_back";
+         target: "title2";
+         target: "title_over";
+         target: "buttons_foc";
+         target: "buttons_unfoc";
+         target: "elm.text.title";
+      }
+      program {
+         name: "focus_out";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.2;
+         target: "title_back";
+         target: "title2";
+         target: "title_over";
+         target: "buttons_foc";
+         target: "buttons_unfoc";
+         target: "elm.text.title";
+      }
+   }
+}