summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-09 10:45:53 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-18 11:45:52 -0500
commit1acfb78e9bf0bd7dccbe1092d4f3206554ae919a (patch)
tree0b5c0788d5bc7a106772371d0196fe3c97e693bd
parenta0fc71752d5a0a7cac720f7997cf9c42096e7201 (diff)
handle e_scale correctly in bryces
-rw-r--r--src/bin/e_bryce.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index cdcebcab3..7db63b968 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -106,18 +106,18 @@ _bryce_autohide_coords(Bryce *b, int *x, int *y)
106 *x = b->x; 106 *x = b->x;
107 107
108 if (an & E_GADGET_SITE_ANCHOR_TOP) 108 if (an & E_GADGET_SITE_ANCHOR_TOP)
109 *y = oy - b->size + b->autohide_size; 109 *y = oy - (e_scale * b->size) + e_scale * (b->autohide_size);
110 if (an & E_GADGET_SITE_ANCHOR_BOTTOM) 110 if (an & E_GADGET_SITE_ANCHOR_BOTTOM)
111 *y = oy + oh - b->autohide_size; 111 *y = oy + oh - (e_scale * b->autohide_size);
112 } 112 }
113 else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL) 113 else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL)
114 { 114 {
115 *y = b->y; 115 *y = b->y;
116 116
117 if (an & E_GADGET_SITE_ANCHOR_LEFT) 117 if (an & E_GADGET_SITE_ANCHOR_LEFT)
118 *x = ox - b->size + b->autohide_size; 118 *x = ox - (e_scale * b->size) + e_scale * (b->autohide_size);
119 if (an & E_GADGET_SITE_ANCHOR_RIGHT) 119 if (an & E_GADGET_SITE_ANCHOR_RIGHT)
120 *x = ox + ow - b->autohide_size; 120 *x = ox + ow - (e_scale * b->autohide_size);
121 } 121 }
122} 122}
123 123
@@ -159,14 +159,14 @@ _bryce_position(Bryce *b, int w, int h, int *nx, int *ny)
159 if (an & E_GADGET_SITE_ANCHOR_RIGHT) 159 if (an & E_GADGET_SITE_ANCHOR_RIGHT)
160 x = ox + ow - w; 160 x = ox + ow - w;
161 if (an & E_GADGET_SITE_ANCHOR_BOTTOM) 161 if (an & E_GADGET_SITE_ANCHOR_BOTTOM)
162 y = oy + oh - b->size; 162 y = oy + oh - (e_scale * b->size);
163 if (!b->autosize) 163 if (!b->autosize)
164 x = ox; 164 x = ox;
165 } 165 }
166 else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL) 166 else if (b->orient == E_GADGET_SITE_ORIENT_VERTICAL)
167 { 167 {
168 if (an & E_GADGET_SITE_ANCHOR_RIGHT) 168 if (an & E_GADGET_SITE_ANCHOR_RIGHT)
169 x = ox + ow - b->size; 169 x = ox + ow - (e_scale * b->size);
170 if (an & E_GADGET_SITE_ANCHOR_BOTTOM) 170 if (an & E_GADGET_SITE_ANCHOR_BOTTOM)
171 y = oy + oh - h; 171 y = oy + oh - h;
172 if (!b->autosize) 172 if (!b->autosize)
@@ -1013,7 +1013,7 @@ e_bryce_add(Evas_Object *parent, const char *name, E_Gadget_Site_Orient orient,
1013 Bryce *b; 1013 Bryce *b;
1014 1014
1015 b = E_NEW(Bryce, 1); 1015 b = E_NEW(Bryce, 1);
1016 b->size = 48; 1016 b->size = e_scale * 48;
1017 b->name = eina_stringshare_add(name); 1017 b->name = eina_stringshare_add(name);
1018 b->anchor = an; 1018 b->anchor = an;
1019 b->orient = orient; 1019 b->orient = orient;