mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-06 00:30:08 +00:00
Combo box flipping support.
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org> Combo box flipping support. * gtk/gtkcombobox.c (gtk_combo_box_menu_position), (gtk_combo_box_size_allocate): support RTL flipping (#126518, patch from Matthias Clasen), (gtk_combo_box_popup): fix popup window alignment if there's a cell view frame visible (#126518, patch from Semion Chichelnitsky). * gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping (#128348, patch from Semion Chichelnitsky).
This commit is contained in:
Kristian Rietveld
Kristian Rietveld
parent
f0293295db
commit
375ccb28b3
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Combo box flipping support.
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
|
||||
(gtk_combo_box_size_allocate): support RTL flipping (#126518,
|
||||
patch from Matthias Clasen),
|
||||
(gtk_combo_box_popup): fix popup window alignment if there's a
|
||||
cell view frame visible (#126518, patch from Semion Chichelnitsky).
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping
|
||||
(#128348, patch from Semion Chichelnitsky).
|
||||
|
||||
Fri Dec 12 01:13:34 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* examples/gtkdial/gtkdial.c:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Combo box flipping support.
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
|
||||
(gtk_combo_box_size_allocate): support RTL flipping (#126518,
|
||||
patch from Matthias Clasen),
|
||||
(gtk_combo_box_popup): fix popup window alignment if there's a
|
||||
cell view frame visible (#126518, patch from Semion Chichelnitsky).
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping
|
||||
(#128348, patch from Semion Chichelnitsky).
|
||||
|
||||
Fri Dec 12 01:13:34 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* examples/gtkdial/gtkdial.c:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Combo box flipping support.
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
|
||||
(gtk_combo_box_size_allocate): support RTL flipping (#126518,
|
||||
patch from Matthias Clasen),
|
||||
(gtk_combo_box_popup): fix popup window alignment if there's a
|
||||
cell view frame visible (#126518, patch from Semion Chichelnitsky).
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping
|
||||
(#128348, patch from Semion Chichelnitsky).
|
||||
|
||||
Fri Dec 12 01:13:34 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* examples/gtkdial/gtkdial.c:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Combo box flipping support.
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
|
||||
(gtk_combo_box_size_allocate): support RTL flipping (#126518,
|
||||
patch from Matthias Clasen),
|
||||
(gtk_combo_box_popup): fix popup window alignment if there's a
|
||||
cell view frame visible (#126518, patch from Semion Chichelnitsky).
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping
|
||||
(#128348, patch from Semion Chichelnitsky).
|
||||
|
||||
Fri Dec 12 01:13:34 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* examples/gtkdial/gtkdial.c:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
Fri Dec 12 21:00:12 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
Combo box flipping support.
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
|
||||
(gtk_combo_box_size_allocate): support RTL flipping (#126518,
|
||||
patch from Matthias Clasen),
|
||||
(gtk_combo_box_popup): fix popup window alignment if there's a
|
||||
cell view frame visible (#126518, patch from Semion Chichelnitsky).
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_expose): support RTL flipping
|
||||
(#128348, patch from Semion Chichelnitsky).
|
||||
|
||||
Fri Dec 12 01:13:34 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* examples/gtkdial/gtkdial.c:
|
||||
|
||||
@ -403,6 +403,7 @@ gtk_cell_view_expose (GtkWidget *widget,
|
||||
GList *i;
|
||||
GtkCellView *cellview;
|
||||
GdkRectangle area;
|
||||
gboolean rtl = (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL);
|
||||
|
||||
cellview = GTK_CELL_VIEW (widget);
|
||||
|
||||
@ -439,7 +440,7 @@ gtk_cell_view_expose (GtkWidget *widget,
|
||||
area = widget->allocation;
|
||||
|
||||
/* we draw on our very own window, initialize x and y to zero */
|
||||
area.x = widget->allocation.x;
|
||||
area.x = widget->allocation.x + (rtl ? widget->allocation.width : 0);
|
||||
area.y = widget->allocation.y;
|
||||
|
||||
/* PACK_START */
|
||||
@ -454,6 +455,8 @@ gtk_cell_view_expose (GtkWidget *widget,
|
||||
continue;
|
||||
|
||||
area.width = info->real_width;
|
||||
if (rtl)
|
||||
area.x -= area.width;
|
||||
|
||||
gtk_cell_renderer_render (info->cell,
|
||||
event->window,
|
||||
@ -461,9 +464,12 @@ gtk_cell_view_expose (GtkWidget *widget,
|
||||
/* FIXME! */
|
||||
&area, &area, &event->area, 0);
|
||||
|
||||
if (!rtl)
|
||||
area.x += info->real_width;
|
||||
}
|
||||
|
||||
area.x = rtl ? widget->allocation.x : (widget->allocation.x + widget->allocation.width);
|
||||
|
||||
/* PACK_END */
|
||||
for (i = cellview->priv->cell_list; i; i = i->next)
|
||||
{
|
||||
@ -476,12 +482,15 @@ gtk_cell_view_expose (GtkWidget *widget,
|
||||
continue;
|
||||
|
||||
area.width = info->real_width;
|
||||
if (!rtl)
|
||||
area.x -= area.width;
|
||||
|
||||
gtk_cell_renderer_render (info->cell,
|
||||
widget->window,
|
||||
widget,
|
||||
/* FIXME ! */
|
||||
&area, &area, &event->area, 0);
|
||||
if (rtl)
|
||||
area.x += info->real_width;
|
||||
}
|
||||
|
||||
|
||||
@ -694,6 +694,9 @@ gtk_combo_box_menu_position (GtkMenu *menu,
|
||||
|
||||
gtk_widget_size_request (GTK_WIDGET (menu), &req);
|
||||
|
||||
if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_RTL)
|
||||
*x = sx;
|
||||
else
|
||||
*x = sx + child->allocation.width - req.width;
|
||||
*y = sy + child->allocation.height;
|
||||
|
||||
@ -742,6 +745,15 @@ gtk_combo_box_popup (GtkComboBox *combo_box)
|
||||
|
||||
gdk_window_get_origin (sample->window,
|
||||
&x, &y);
|
||||
|
||||
if (combo_box->priv->cell_view_frame)
|
||||
{
|
||||
x -= GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
|
||||
GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness;
|
||||
width += 2 * (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
|
||||
GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness);
|
||||
}
|
||||
|
||||
gtk_widget_set_size_request (combo_box->priv->popup_window,
|
||||
width, -1);
|
||||
|
||||
@ -939,6 +951,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
|
||||
GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
|
||||
GtkAllocation child;
|
||||
GtkRequisition req;
|
||||
gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
|
||||
@ -960,35 +973,53 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
|
||||
child.x = allocation->x + border_width + 1 + xthickness + 2;
|
||||
child.y = allocation->y + border_width + 1 + ythickness + 2;
|
||||
|
||||
width = allocation->width - (border_width + 1 + ythickness * 2 + 4);
|
||||
width = allocation->width - (border_width + 1 + xthickness * 2 + 4);
|
||||
|
||||
/* handle the childs */
|
||||
gtk_widget_size_request (combo_box->priv->arrow, &req);
|
||||
child.width = req.width;
|
||||
child.height = allocation->height - 2 * (child.y - allocation->y);
|
||||
if (!is_rtl)
|
||||
child.x += width - req.width;
|
||||
gtk_widget_size_allocate (combo_box->priv->arrow, &child);
|
||||
|
||||
if (is_rtl)
|
||||
child.x += req.width;
|
||||
gtk_widget_size_request (combo_box->priv->separator, &req);
|
||||
child.width = req.width;
|
||||
if (!is_rtl)
|
||||
child.x -= req.width;
|
||||
gtk_widget_size_allocate (combo_box->priv->separator, &child);
|
||||
|
||||
if (is_rtl)
|
||||
{
|
||||
child.x += req.width;
|
||||
child.width = allocation->x + allocation->width
|
||||
- (border_width + 1 + xthickness + 2) - child.x;
|
||||
}
|
||||
else
|
||||
{
|
||||
child.width = child.x;
|
||||
child.x = allocation->x + border_width + 1 + xthickness + 2;
|
||||
child.width -= child.x;
|
||||
}
|
||||
|
||||
gtk_widget_size_allocate (GTK_BIN (widget)->child, &child);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_widget_size_request (combo_box->priv->button, &req);
|
||||
if (is_rtl)
|
||||
child.x = allocation->x;
|
||||
else
|
||||
child.x = allocation->x + allocation->width - req.width;
|
||||
child.y = allocation->y;
|
||||
child.width = req.width;
|
||||
child.height = allocation->height;
|
||||
gtk_widget_size_allocate (combo_box->priv->button, &child);
|
||||
|
||||
if (is_rtl)
|
||||
child.x = allocation->x + req.width;
|
||||
else
|
||||
child.x = allocation->x;
|
||||
child.y = allocation->y;
|
||||
child.width = allocation->width - req.width;
|
||||
@ -1001,13 +1032,19 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
|
||||
|
||||
/* button */
|
||||
gtk_widget_size_request (combo_box->priv->button, &req);
|
||||
child.x = allocation->x + allocation->width - req.width;
|
||||
if (is_rtl)
|
||||
child.x = allocation->x;
|
||||
else
|
||||
child.x += allocation->x + allocation->width - req.width;
|
||||
child.y = allocation->y;
|
||||
child.width = req.width;
|
||||
child.height = allocation->height;
|
||||
gtk_widget_size_allocate (combo_box->priv->button, &child);
|
||||
|
||||
/* frame */
|
||||
if (is_rtl)
|
||||
child.x = allocation->x + req.width;
|
||||
else
|
||||
child.x = allocation->x;
|
||||
child.y = allocation->y;
|
||||
child.width = allocation->width - req.width;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user