summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/elementary/data/themes/widgets/conformant.edc17
-rw-r--r--legacy/elementary/src/lib/elm_conform.c54
2 files changed, 44 insertions, 27 deletions
diff --git a/legacy/elementary/data/themes/widgets/conformant.edc b/legacy/elementary/data/themes/widgets/conformant.edc
index 4a128e3cf5..65cabeaa47 100644
--- a/legacy/elementary/data/themes/widgets/conformant.edc
+++ b/legacy/elementary/data/themes/widgets/conformant.edc
@@ -1,6 +1,6 @@
1group { name: "elm/conformant/base/default"; 1group { name: "elm/conformant/base/default";
2 parts { 2 parts {
3 part { name: "elm.swallow.shelf"; 3 part { name: "elm.swallow.indicator";
4 type: SWALLOW; 4 type: SWALLOW;
5 description { state: "default" 0.0; 5 description { state: "default" 0.0;
6 fixed: 0 1; 6 fixed: 0 1;
@@ -14,21 +14,30 @@ group { name: "elm/conformant/base/default";
14 fixed: 0 1; 14 fixed: 0 1;
15 align: 0.5 0.5; 15 align: 0.5 0.5;
16 rel1.relative: 0.0 1.0; 16 rel1.relative: 0.0 1.0;
17 rel1.to_y: "elm.swallow.shelf"; 17 rel1.to_y: "elm.swallow.indicator";
18 rel2.relative: 1.0 0.0; 18 rel2.relative: 1.0 0.0;
19 rel2.to_y: "elm.swallow.virtualkeypad"; 19 rel2.to_y: "elm.swallow.virtualkeypad";
20 } 20 }
21 } 21 }
22 part { name: "elm.swallow.clipboard";
23 type: SWALLOW;
24 description { state: "default" 0.0;
25 fixed: 0 1;
26 align: 0.0 1.0;
27 rel2.relative: 1.0 0.0;
28 rel2.to_y: "elm.swallow.softkey";
29 }
30 }
22 part { name: "elm.swallow.virtualkeypad"; 31 part { name: "elm.swallow.virtualkeypad";
23 type: SWALLOW; 32 type: SWALLOW;
24 description { state: "default" 0.0; 33 description { state: "default" 0.0;
25 fixed: 0 1; 34 fixed: 0 1;
26 align: 0.0 1.0; 35 align: 0.0 1.0;
27 rel2.relative: 1.0 0.0; 36 rel2.relative: 1.0 0.0;
28 rel2.to_y: "elm.swallow.panel"; 37 rel2.to_y: "elm.swallow.softkey";
29 } 38 }
30 } 39 }
31 part { name: "elm.swallow.panel"; 40 part { name: "elm.swallow.softkey";
32 type: SWALLOW; 41 type: SWALLOW;
33 description { state: "default" 0.0; 42 description { state: "default" 0.0;
34 fixed: 0 1; 43 fixed: 0 1;
diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c
index ac69b85c04..61591586c0 100644
--- a/legacy/elementary/src/lib/elm_conform.c
+++ b/legacy/elementary/src/lib/elm_conform.c
@@ -13,7 +13,10 @@ typedef struct _Widget_Data Widget_Data;
13struct _Widget_Data 13struct _Widget_Data
14{ 14{
15 Evas_Object *base; 15 Evas_Object *base;
16 Evas_Object *shelf, *panel, *virtualkeypad, *clipboard; 16 Evas_Object *indicator;
17 Evas_Object *softkey;
18 Evas_Object *virtualkeypad;
19 Evas_Object *clipboard;
17 Evas_Object *content; 20 Evas_Object *content;
18 Evas_Object *scroller; 21 Evas_Object *scroller;
19#ifdef HAVE_ELEMENTARY_X 22#ifdef HAVE_ELEMENTARY_X
@@ -119,8 +122,6 @@ _theme_hook(Evas_Object *obj)
119 122
120 if (wd->content) 123 if (wd->content)
121 edje_object_part_swallow(wd->base, "elm.swallow.content", wd->content); 124 edje_object_part_swallow(wd->base, "elm.swallow.content", wd->content);
122 edje_object_scale_set(wd->base, elm_widget_scale_get(obj)
123 * _elm_config->scale);
124 _sizing_eval(obj); 125 _sizing_eval(obj);
125} 126}
126 127
@@ -282,7 +283,7 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
282 ; 283 ;
283#endif 284#endif
284 } 285 }
285 _conformant_part_size_set(obj, wd->shelf, sx, sy, sw, sh); 286 _conformant_part_size_set(obj, wd->indicator, sx, sy, sw, sh);
286 } 287 }
287 if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART) 288 if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART)
288 { 289 {
@@ -312,7 +313,7 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
312 ; 313 ;
313#endif 314#endif
314 } 315 }
315 _conformant_part_size_set(obj, wd->panel, sx, sy, sw, sh); 316 _conformant_part_size_set(obj, wd->softkey, sx, sy, sw, sh);
316 } 317 }
317 if (part_type & ELM_CONFORM_CLIPBOARD_PART) 318 if (part_type & ELM_CONFORM_CLIPBOARD_PART)
318 { 319 {
@@ -335,23 +336,26 @@ static void
335_swallow_conformant_parts(Evas_Object *obj) 336_swallow_conformant_parts(Evas_Object *obj)
336{ 337{
337 Widget_Data *wd = elm_widget_data_get(obj); 338 Widget_Data *wd = elm_widget_data_get(obj);
338 339 Evas *e = evas_object_evas_get(obj);
339 wd->scroller = NULL; 340 wd->scroller = NULL;
340 if (!wd->shelf) 341
342 //Indicator
343 if (!wd->indicator)
341 { 344 {
342 wd->shelf = evas_object_rectangle_add(evas_object_evas_get(obj)); 345 wd->indicator = evas_object_rectangle_add(e);
343 elm_widget_sub_object_add(obj, wd->shelf); 346 elm_widget_sub_object_add(obj, wd->indicator);
344 evas_object_size_hint_min_set(wd->shelf, -1, 0); 347 evas_object_size_hint_min_set(wd->indicator, -1, 0);
345 evas_object_size_hint_max_set(wd->shelf, -1, 0); 348 evas_object_size_hint_max_set(wd->indicator, -1, 0);
346 } 349 }
347 else 350 else
348 _conformant_part_sizing_eval(obj, ELM_CONFORM_INDICATOR_PART); 351 _conformant_part_sizing_eval(obj, ELM_CONFORM_INDICATOR_PART);
349 evas_object_color_set(wd->shelf, 0, 0, 0, 0); 352 evas_object_color_set(wd->indicator, 0, 0, 0, 0);
350 edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf); 353 edje_object_part_swallow(wd->base, "elm.swallow.indicator", wd->indicator);
351 354
355 //Virtual Keyboard
352 if (!wd->virtualkeypad) 356 if (!wd->virtualkeypad)
353 { 357 {
354 wd->virtualkeypad = evas_object_rectangle_add(evas_object_evas_get(obj)); 358 wd->virtualkeypad = evas_object_rectangle_add(e);
355 elm_widget_sub_object_add(obj, wd->virtualkeypad); 359 elm_widget_sub_object_add(obj, wd->virtualkeypad);
356 evas_object_size_hint_min_set(wd->virtualkeypad, -1, 0); 360 evas_object_size_hint_min_set(wd->virtualkeypad, -1, 0);
357 evas_object_size_hint_max_set(wd->virtualkeypad, -1, 0); 361 evas_object_size_hint_max_set(wd->virtualkeypad, -1, 0);
@@ -361,28 +365,32 @@ _swallow_conformant_parts(Evas_Object *obj)
361 evas_object_color_set(wd->virtualkeypad, 0, 0, 0, 0); 365 evas_object_color_set(wd->virtualkeypad, 0, 0, 0, 0);
362 edje_object_part_swallow(wd->base, "elm.swallow.virtualkeypad", 366 edje_object_part_swallow(wd->base, "elm.swallow.virtualkeypad",
363 wd->virtualkeypad); 367 wd->virtualkeypad);
364 368 //Clipboard
365 if (!wd->clipboard) 369 if (!wd->clipboard)
366 { 370 {
367 wd->clipboard = evas_object_rectangle_add(evas_object_evas_get(obj)); 371 wd->clipboard = evas_object_rectangle_add(e);
368 elm_widget_sub_object_add(obj, wd->clipboard); 372 elm_widget_sub_object_add(obj, wd->clipboard);
369 evas_object_size_hint_min_set(wd->clipboard, -1, 0); 373 evas_object_size_hint_min_set(wd->clipboard, -1, 0);
370 evas_object_size_hint_max_set(wd->clipboard, -1, 0); 374 evas_object_size_hint_max_set(wd->clipboard, -1, 0);
371 } 375 }
372 else 376 else
373 _conformant_part_sizing_eval(obj, ELM_CONFORM_CLIPBOARD_PART); 377 _conformant_part_sizing_eval(obj, ELM_CONFORM_CLIPBOARD_PART);
378 evas_object_color_set(wd->clipboard, 0, 0, 0, 0);
379 edje_object_part_swallow(wd->base, "elm.swallow.clipboard",
380 wd->clipboard);
374 381
375 if (!wd->panel) 382 //Softkey
383 if (!wd->softkey)
376 { 384 {
377 wd->panel = evas_object_rectangle_add(evas_object_evas_get(obj)); 385 wd->softkey = evas_object_rectangle_add(e);
378 elm_widget_sub_object_add(obj, wd->panel); 386 elm_widget_sub_object_add(obj, wd->softkey);
379 evas_object_size_hint_min_set(wd->panel, -1, 0); 387 evas_object_size_hint_min_set(wd->softkey, -1, 0);
380 evas_object_size_hint_max_set(wd->panel, -1, 0); 388 evas_object_size_hint_max_set(wd->softkey, -1, 0);
381 } 389 }
382 else 390 else
383 _conformant_part_sizing_eval(obj, ELM_CONFORM_SOFTKEY_PART); 391 _conformant_part_sizing_eval(obj, ELM_CONFORM_SOFTKEY_PART);
384 evas_object_color_set(wd->panel, 0, 0, 0, 0); 392 evas_object_color_set(wd->softkey, 0, 0, 0, 0);
385 edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel); 393 edje_object_part_swallow(wd->base, "elm.swallow.softkey", wd->softkey);
386} 394}
387 395
388static void 396static void