AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Position the focus rectangle correctly in RTL mode. (#333291, Benjamin

Browse Source 
2006-03-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkexpander.c (gtk_expander_paint_focus): Position
	the focus rectangle correctly in RTL mode.  (#333291,
	Benjamin Berg)
This commit is contained in:
Matthias Clasen 2006-03-04 05:17:40 +00:00 committed by Matthias Clasen
parent 9907ebb2ce
commit 6074d1f9d4
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkexpander.c (gtk_expander_paint_focus): Position
the focus rectangle correctly in RTL mode. (#333291,
Benjamin Berg)
2006-03-03 Tor Lillqvist <tml@novell.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_commit_char)

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-03-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkexpander.c (gtk_expander_paint_focus): Position
the focus rectangle correctly in RTL mode. (#333291,
Benjamin Berg)
2006-03-03 Tor Lillqvist <tml@novell.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_commit_char)

26
gtk/gtkexpander.c
View File

@ -817,12 +817,6 @@ gtk_expander_paint_focus (GtkExpander *expander,
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
x = widget->allocation.x + border_width;
y = widget->allocation.y + border_width;
if (ltr && interior_focus)
x += expander_spacing * 2 + expander_size;
width = height = 0;
if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
@ -833,15 +827,29 @@ gtk_expander_paint_focus (GtkExpander *expander,
height = label_allocation.height;
}
width += 2 * focus_pad + 2 * focus_width;
height += 2 * focus_pad + 2 * focus_width;
x = widget->allocation.x + border_width;
y = widget->allocation.y + border_width;
if (ltr)
{
if (interior_focus)
x += expander_spacing * 2 + expander_size;
}
else
{
x += widget->allocation.width - 2 * border_width
- expander_spacing * 2 - expander_size - width;
}
if (!interior_focus)
{
width += expander_size + 2 * expander_spacing;
height = MAX (height, expander_size + 2 * expander_spacing);
}
width += 2 * focus_pad + 2 * focus_width;
height += 2 * focus_pad + 2 * focus_width;
gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
area, widget, "expander",
x, y, width, height);