From 4a180d988d36ee6a7d8a1d4e106b801410a2a05c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 12 May 2014 04:35:32 +1000
Subject: Fiddle with the winFang title, and white space cleanups on
winFang.edc.
---
src/libraries/winFang.c | 24 +---
src/libraries/winFang.edc | 277 +++++++++++++++++++++++++---------------------
2 files changed, 155 insertions(+), 146 deletions(-)
(limited to 'src/libraries')
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index e2dce45..0d1137f 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -185,6 +185,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
{
eina_clist_add_head(&parent->winFangs, &result->node);
obj = parent->win;
+ h += 15;
+ result->h = h;
}
else
{
@@ -199,7 +201,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
snprintf(buf, sizeof(buf), "%s/winFang.edj", elm_app_data_dir_get());
result->layout = eo_add(ELM_OBJ_LAYOUT_CLASS, obj,
- evas_obj_size_set(result->w, result->h),
+ evas_obj_size_set(w, h),
evas_obj_position_set(x, y),
evas_obj_name_set(WF_LAYOUT),
elm_obj_layout_file_set(buf, WF_LAYOUT),
@@ -211,7 +213,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
if (result->parent)
{
-result->win = result->layout;
+ result->win = result->layout;
+ elm_layout_signal_emit(result->layout, "isInternal", "isInternal");
// Something to catch clicks on the background, for moving the window.
// Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle.
@@ -246,9 +249,6 @@ result->win = result->layout;
eo_unref(result->hand[i]);
}
- if (title)
- elm_object_part_text_set(result->layout, WF_TITLE, title);
-/*
result->title = eo_add(ELM_OBJ_LABEL_CLASS, result->layout,
evas_obj_size_hint_align_set(EVAS_HINT_FILL, 1.0),
evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0),
@@ -257,20 +257,8 @@ result->win = result->layout;
elm_object_style_set(result->title, "slide_bounce");
snprintf(buf, PATH_MAX, "%s", title);
elm_object_text_set(result->title, buf);
- elm_box_pack_end(result->box, result->title);
+ elm_object_part_content_set(result->layout, WF_TITLE, result->title);
eo_unref(result->title);
-*/
-
-/*
- obj1 = eo_add(ELM_OBJ_SEPARATOR_CLASS, result->layout,
- evas_obj_size_hint_align_set(EVAS_HINT_FILL, 1.0),
- evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0),
- elm_obj_separator_horizontal_set(EINA_TRUE),
- evas_obj_visibility_set(EINA_TRUE)
- );
- elm_box_pack_end(result->box, obj1);
- eo_unref(obj1);
-*/
}
result->grid = eo_add(ELM_OBJ_GRID_CLASS, result->layout,
diff --git a/src/libraries/winFang.edc b/src/libraries/winFang.edc
index a7a786c..4b6f05d 100644
--- a/src/libraries/winFang.edc
+++ b/src/libraries/winFang.edc
@@ -1,137 +1,158 @@
-// The images we use.
images
{
- image: "bubble.png" COMP; // COMP means to use lossless compression.
- image: "bubble_sh.png" COMP;
- image: "logo.png" COMP;
- image: "pt.png" COMP;
- image: "sky_01.jpg" COMP;
- image: "sky_02.jpg" COMP;
- image: "sky_03.jpg" COMP;
- image: "sky_04.jpg" COMP;
+ image: "bubble.png" COMP; // COMP means to use lossless compression.
+ image: "bubble_sh.png" COMP;
+ image: "logo.png" COMP;
+ image: "pt.png" COMP;
+ image: "sky_01.jpg" COMP;
+ image: "sky_02.jpg" COMP;
+ image: "sky_03.jpg" COMP;
+ image: "sky_04.jpg" COMP;
}
-collections {
-
- group {
- name: "winFang/layout";
-
- data {
- item: "title" "Layout based internal window";
+collections
+{
+ group
+ {
+ name: "winFang/layout";
+ parts
+ {
+ part
+ { name: "winFang/background";
+ type: IMAGE;
+ // Ignore mouse events.
+ mouse_events: 0;
+ // Each part has one or more descriptions, or states.
+ // They all have to have at least this default state.
+ description
+ { state: "default" 0.0;
+ // RGBA, so this is purple, and semi transparent.
+// color: 50 0 100 100; // pre multiplied R = (r * a) / 255
+ color: 126 0 255 100; // r = (R * 255) / a
+ aspect_preference: HORIZONTAL;
+ image{normal: "sky_04.jpg";}
+ }
}
- parts {
-
- // The first part, the black background RECTangle of the screens.
- part
- { name: "winFang/background";
- type: IMAGE;
- // Ignore mouse events.
- mouse_events: 0;
- // Each part has one or more descriptions, or states.
- // They all have to have at least this default state.
- description
- { state: "default" 0.0;
- // RGBA, so this is purple, and semi transparent.
-// color: 50 0 100 100; // pre multiplied R = (r * a) / 255
- color: 126 0 255 100; // r = (R * 255) / a
- aspect_preference: HORIZONTAL;
- image {
- normal: "sky_04.jpg";
- }
- }
- }
-
- part {
- name: "winFang/underlay";
- type: SWALLOW;
- mouse_events: 1;
-
- description {
- state: "default" 0.0;
-
- rel1 {
- relative: 0.0 0.0;
- to: "winFang/background";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "winFang/background";
- }
- }
- } // winFang/underlay
-
- part {
- name: "winFang/title";
- type: TEXT;
- mouse_events: 0;
-
- description {
- state: "default" 0.0;
- color: 255 255 255 255;
- rel1 {
- relative: 0.0 0.0;
- to: "winFang/background";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "winFang/background";
- offset: 0 15;
- }
- text {
- text: "";
- size: 10;
- font: "sans";
- min: 0 1;
- max: 0 1;
- }
- }
- }
-
- part {
- name: "winFang/box";
- type: BOX;
- mouse_events: 1;
-
- description {
- state: "default" 0.0;
-
- box {
- layout: "vertical";
- }
- rel1 {
- relative: 0.0 0.0;
- to: "winFang/title";
- offset: 0 15;
- }
- rel2 {
- relative: 1.0 1.0;
- to: "winFang/background";
- }
- }
- } // winFang/box
-
- part {
- name: "winFang/content";
- type: SWALLOW;
- mouse_events: 1;
-
- description {
- state: "default" 0.0;
- fixed: 1 1;
-
- rel1 {
- relative: 0.0 0.0;
- to: "winFang/title";
- offset: 0 15;
- }
- rel2 {
- relative: 1.0 1.0;
- to: "winFang/background";
- }
- }
- } // winFang/content
+ part
+ { name: "winFang/underlay";
+ type: SWALLOW;
+ mouse_events: 1;
+
+ description
+ { state: "default" 0.0;
+ rel1
+ {
+ relative: 0.0 0.0;
+ to: "winFang/background";
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ to: "winFang/background";
+ }
+ }
+ } // winFang/underlay
+
+ part
+ { name: "winFang/title";
+ type: SWALLOW;
+ mouse_events: 0;
+
+ description
+ { state: "default" 0.0;
+ visible: 0;
+ }
+
+ description
+ { state: "internal" 0.0;
+ inherit: "default" 0;
+ visible: 1;
+ rel1
+ {
+ relative: 0.0 0.0;
+ to: "winFang/background";
+ }
+ rel2
+ {
+ relative: 1.0 0.0;
+ to: "winFang/background";
+ offset: 0 15;
+ }
+ }
+ }
+ part
+ { name: "winFang/box";
+ type: BOX;
+ mouse_events: 1;
+
+ description
+ {
+ state: "default" 0.0;
+ box{layout: "vertical";}
+ rel1
+ {
+ relative: 0.0 0.0;
+ to: "winFang/background";
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ to: "winFang/background";
+ }
+ }
+
+ description
+ { state: "internal" 0.0;
+ inherit: "default" 0;
+ rel1
+ {
+ relative: 0.0 0.0;
+ to: "winFang/title";
+ offset: 0 15;
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ to: "winFang/background";
+ }
+ }
+ } // winFang/box
+
+ part
+ { name: "winFang/content";
+ type: SWALLOW;
+ mouse_events: 1;
+
+ description
+ { state: "default" 0.0;
+ fixed: 1 1;
+ rel1
+ {
+ relative: 0.0 0.0;
+ to: "winFang/box";
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ to: "winFang/box";
+ }
+ }
+ } // winFang/content
+
+ programs
+ {
+ program
+ { name: "isInternal";
+ signal: "isInternal";
+ source: "isInternal";
+ action: STATE_SET "internal" 0.0;
+ target: "winFang/title";
+ target: "winFang/box";
+ }
}
- }
+
+ }
+ }
}
--
cgit v1.1