summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-03-17 12:23:07 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-03-17 12:24:27 -0400
commit49ef693cef2ed7e13e1ad4f9bba258f18446463f (patch)
tree479e33ef57f5ca9c4fc52e703236a5d90658ca13
parent8404615e3bea3092f02028cf4f5eb9c383d33b0b (diff)
bugfix: get entry width based on viewport size, not entry size
things like icon properties dialog now fit on a 4k monitor
-rw-r--r--src/bin/e_entry.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c
index 2e3f9fa6b..beb9dc545 100644
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@@ -243,12 +243,14 @@ EAPI void
243e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh) 243e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
244{ 244{
245 E_Entry_Smart_Data *sd; 245 E_Entry_Smart_Data *sd;
246 int vw;
246 247
247 if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR(); 248 if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
248 if ((!entry) || (!(sd = evas_object_smart_data_get(entry)))) 249 if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
249 return; 250 return;
250 251
251 if (minw) *minw = sd->theme_width + sd->min_width; 252 e_scrollframe_child_viewport_size_get(sd->scroll_object, &vw, NULL);
253 if (minw) *minw = sd->theme_width + vw;
252 if (minh) *minh = sd->theme_height + sd->height; 254 if (minh) *minh = sd->theme_height + sd->height;
253} 255}
254 256