summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-08-11 14:27:27 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-08-11 14:28:51 +0900
commit479b189c9a5f177c8511305321654f7408fcb3b1 (patch)
tree93b03ad5dbb447a635797b4ccc790c6e6c4462a4 /src/lib
parent92c26078c779343df12e8bf0f6b2ccc6ef645cb9 (diff)
Efl.Ui.Panes: rename allow_user_size_hints to hint_min_allow
thanks to raster for suggestion.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_panes.c20
-rw-r--r--src/lib/elementary/efl_ui_panes_internal_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes_private.h4
3 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index aaf45547d9..34de4609f8 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -192,7 +192,7 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd)
192 192
193 if (first_content) 193 if (first_content)
194 { 194 {
195 if (!sd->first_allow_user_hints) 195 if (!sd->first_hint_min_allow)
196 efl_gfx_size_hint_combined_min_get(first_content, &sd->first_minw, &sd->first_minh); 196 efl_gfx_size_hint_combined_min_get(first_content, &sd->first_minw, &sd->first_minh);
197 else 197 else
198 efl_gfx_size_hint_min_get(first_content, &sd->first_minw, &sd->first_minh); 198 efl_gfx_size_hint_min_get(first_content, &sd->first_minw, &sd->first_minh);
@@ -200,7 +200,7 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd)
200 200
201 if (second_content) 201 if (second_content)
202 { 202 {
203 if (!sd->second_allow_user_hints) 203 if (!sd->second_hint_min_allow)
204 efl_gfx_size_hint_combined_min_get(second_content, &sd->second_minw, &sd->second_minh); 204 efl_gfx_size_hint_combined_min_get(second_content, &sd->second_minw, &sd->second_minh);
205 else 205 else
206 efl_gfx_size_hint_min_get(second_content, &sd->second_minw, &sd->second_minh); 206 efl_gfx_size_hint_min_get(second_content, &sd->second_minw, &sd->second_minh);
@@ -603,27 +603,27 @@ _efl_ui_panes_class_constructor(Efl_Class *klass)
603ELM_PART_OVERRIDE(efl_ui_panes, EFL_UI_PANES, EFL_UI_LAYOUT, Efl_Ui_Panes_Data, Elm_Part_Data) 603ELM_PART_OVERRIDE(efl_ui_panes, EFL_UI_PANES, EFL_UI_LAYOUT, Efl_Ui_Panes_Data, Elm_Part_Data)
604 604
605EOLIAN static void 605EOLIAN static void
606_efl_ui_panes_internal_part_allow_user_size_hints_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow) 606_efl_ui_panes_internal_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow)
607{ 607{
608 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 608 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
609 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); 609 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS);
610 610
611 if (!strcmp(pd->part, "first")) 611 if (!strcmp(pd->part, "first"))
612 { 612 {
613 if (sd->first_allow_user_hints == allow) return; 613 if (sd->first_hint_min_allow == allow) return;
614 sd->first_allow_user_hints = allow; 614 sd->first_hint_min_allow = allow;
615 elm_layout_sizing_eval(pd->obj); 615 elm_layout_sizing_eval(pd->obj);
616 } 616 }
617 else if (!strcmp(pd->part, "second")) 617 else if (!strcmp(pd->part, "second"))
618 { 618 {
619 if (sd->second_allow_user_hints == allow) return; 619 if (sd->second_hint_min_allow == allow) return;
620 sd->second_allow_user_hints = allow; 620 sd->second_hint_min_allow = allow;
621 elm_layout_sizing_eval(pd->obj); 621 elm_layout_sizing_eval(pd->obj);
622 } 622 }
623} 623}
624 624
625EOLIAN static Eina_Bool 625EOLIAN static Eina_Bool
626_efl_ui_panes_internal_part_allow_user_size_hints_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 626_efl_ui_panes_internal_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
627{ 627{
628 Eina_Bool ret = EINA_FALSE; 628 Eina_Bool ret = EINA_FALSE;
629 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 629 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
@@ -631,11 +631,11 @@ _efl_ui_panes_internal_part_allow_user_size_hints_get(Eo *obj, Elm_Part_Data *_p
631 631
632 if (!strcmp(pd->part, "first")) 632 if (!strcmp(pd->part, "first"))
633 { 633 {
634 ret = sd->first_allow_user_hints; 634 ret = sd->first_hint_min_allow;
635 } 635 }
636 else if (!strcmp(pd->part, "second")) 636 else if (!strcmp(pd->part, "second"))
637 { 637 {
638 ret = sd->second_allow_user_hints; 638 ret = sd->second_hint_min_allow;
639 } 639 }
640 640
641 return ret; 641 return ret;
diff --git a/src/lib/elementary/efl_ui_panes_internal_part.eo b/src/lib/elementary/efl_ui_panes_internal_part.eo
index bb07c84070..0e7ebe82d2 100644
--- a/src/lib/elementary/efl_ui_panes_internal_part.eo
+++ b/src/lib/elementary/efl_ui_panes_internal_part.eo
@@ -3,7 +3,7 @@ class Efl.Ui.Panes.Internal.Part (Efl.Ui.Layout.Internal.Part)
3 [[Elementary Panes internal part class]] 3 [[Elementary Panes internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
5 methods { 5 methods {
6 @property allow_user_size_hints { 6 @property hint_min_allow {
7 [[allow user to set size hints to be respected and ignore combined min size. 7 [[allow user to set size hints to be respected and ignore combined min size.
8 If this flag is set, the minimum size set by @Efl.Gfx.Size.Hint.hint_min.set is respected forcefully. 8 If this flag is set, the minimum size set by @Efl.Gfx.Size.Hint.hint_min.set is respected forcefully.
9 ]] 9 ]]
diff --git a/src/lib/elementary/efl_ui_panes_private.h b/src/lib/elementary/efl_ui_panes_private.h
index 8ff8378d5e..92da6200f9 100644
--- a/src/lib/elementary/efl_ui_panes_private.h
+++ b/src/lib/elementary/efl_ui_panes_private.h
@@ -47,8 +47,8 @@ struct _Efl_Ui_Panes_Data
47 Eina_Bool fixed : 1; 47 Eina_Bool fixed : 1;
48 Eina_Bool left_min_size_is_relative : 1; 48 Eina_Bool left_min_size_is_relative : 1;
49 Eina_Bool right_min_size_is_relative : 1; 49 Eina_Bool right_min_size_is_relative : 1;
50 Eina_Bool first_allow_user_hints : 1; 50 Eina_Bool first_hint_min_allow : 1;
51 Eina_Bool second_allow_user_hints : 1; 51 Eina_Bool second_hint_min_allow : 1;
52}; 52};
53 53
54/** 54/**