callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems with window positioning

Browse Source 
svn path=/trunk/; revision=22524
This commit is contained in:
Matthias Clasen 2009-03-11 23:27:07 +00:00
parent 66117983c0
commit 20708e3827
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-03-11 Matthias Clasen <mclasen@redhat.com>
Bug 572455 – GtkEntry window layed out wrong if the widget has focus
* gtk/gtkentry.c: Fix problems with window positioning. Reported
by Benjamin Berg.
2009-03-11 Tor Lillqvist <tml@iki.fi> 2009-03-11 Tor Lillqvist <tml@iki.fi>
Bug 573067 - Intra-app dnd of text behavior on Windows is wrong Bug 573067 - Intra-app dnd of text behavior on Windows is wrong

8
gtk/gtkentry.c
View File

@ -2265,6 +2265,9 @@ get_icon_allocations (GtkEntry *entry,
get_text_area_size (entry, &x, &y, &width, &height); get_text_area_size (entry, &x, &y, &width, &height);
if (GTK_WIDGET_HAS_FOCUS (entry) && !priv->interior_focus)
y += priv->focus_width;
primary->y = y; primary->y = y;
primary->height = height; primary->height = height;
primary->width = get_icon_width (entry, GTK_ENTRY_ICON_PRIMARY); primary->width = get_icon_width (entry, GTK_ENTRY_ICON_PRIMARY);
@ -2784,7 +2787,6 @@ gtk_entry_size_request (GtkWidget *widget,
static void static void
place_windows (GtkEntry *entry) place_windows (GtkEntry *entry)
{ {
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry); GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint x, y, width, height; gint x, y, width, height;
@ -2793,9 +2795,11 @@ place_windows (GtkEntry *entry)
EntryIconInfo *icon_info = NULL; EntryIconInfo *icon_info = NULL;
get_text_area_size (entry, &x, &y, &width, &height); get_text_area_size (entry, &x, &y, &width, &height);
get_icon_allocations (entry, &primary, &secondary); get_icon_allocations (entry, &primary, &secondary);
if (GTK_WIDGET_HAS_FOCUS (entry) && !priv->interior_focus)
y += priv->focus_width;
if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
x += secondary.width; x += secondary.width;
else else