| 89 gint ox, oy, width, height; |
89 gint ox, oy, width, height; |
| 90 |
90 |
| 91 if (w->parent && w->parent->window == w->window) |
91 if (w->parent && w->parent->window == w->window) |
| 92 { |
92 { |
| 93 get_widget_coords(w->parent, &ox, &oy, NULL, NULL); |
93 get_widget_coords(w->parent, &ox, &oy, NULL, NULL); |
| 94 ox += w->allocation.x; |
|
| 95 oy += w->allocation.y; |
|
| 96 height = w->allocation.height; |
94 height = w->allocation.height; |
| 97 width = w->allocation.width; |
95 width = w->allocation.width; |
| 98 } |
96 } |
| 99 else |
97 else |
| 100 { |
98 { |
| 172 { |
170 { |
| 173 gint x1, x2, y1, y2; |
171 gint x1, x2, y1, y2; |
| 174 gint x = 0, y = 0; |
172 gint x = 0, y = 0; |
| 175 |
173 |
| 176 get_widget_coords(widget, &x1, &y1, &x2, &y2); |
174 get_widget_coords(widget, &x1, &y1, &x2, &y2); |
| |
175 x1 += widget->allocation.x; x2 += widget->allocation.x; |
| |
176 y1 += widget->allocation.y; y2 += widget->allocation.y; |
| 177 |
177 |
| 178 switch (horiz) |
178 switch (horiz) |
| 179 { |
179 { |
| 180 case HINT_POSITION_RIGHT: x = x2; break; |
180 case HINT_POSITION_RIGHT: x = x2; break; |
| 181 case HINT_POSITION_LEFT: x = x1; break; |
181 case HINT_POSITION_LEFT: x = x1; break; |