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

Automatic RTL flipping for handleboxes.

Browse Source
This commit is contained in:
Matthias Clasen
2002-11-02 19:49:02 +00:00
parent d96651b5c2
commit 1fd7ddbd0b
7 changed files with 153 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2002-11-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkhandlebox.c (effective_handle_position):
(gtk_handle_box_size_request):
(gtk_handle_box_size_allocate):
(gtk_handle_box_draw_ghost):
(gtk_handle_box_paint):
(gtk_handle_box_button_changed):
(gtk_handle_box_motion):
Flip handleboxes for RTL locales. (#96629)
Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com> Sat Nov 2 13:47:09 2002 Owen Taylor <otaylor@redhat.com>
* === Released 2.1.2 === * === Released 2.1.2 ===

113
gtk/gtkhandlebox.c
View File

@ -481,6 +481,32 @@ gtk_handle_box_style_set (GtkWidget *widget,
} }
} }
static int
effective_handle_position (GtkHandleBox *hb)
{
int handle_position;
if (gtk_widget_get_direction (GTK_WIDGET (hb)) == GTK_TEXT_DIR_LTR)
handle_position = hb->handle_position;
else
{
switch (hb->handle_position)
{
case GTK_POS_LEFT:
handle_position = GTK_POS_RIGHT;
break;
case GTK_POS_RIGHT:
handle_position = GTK_POS_LEFT;
break;
default:
handle_position = hb->handle_position;
break;
}
}
return handle_position;
}
static void static void
gtk_handle_box_size_request (GtkWidget *widget, gtk_handle_box_size_request (GtkWidget *widget,
GtkRequisition *requisition) GtkRequisition *requisition)
@ -488,12 +514,15 @@ gtk_handle_box_size_request (GtkWidget *widget,
GtkBin *bin; GtkBin *bin;
GtkHandleBox *hb; GtkHandleBox *hb;
GtkRequisition child_requisition; GtkRequisition child_requisition;
gint handle_position;
bin = GTK_BIN (widget); bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget); hb = GTK_HANDLE_BOX (widget);
if (hb->handle_position == GTK_POS_LEFT || handle_position = effective_handle_position (hb);
hb->handle_position == GTK_POS_RIGHT)
if (handle_position == GTK_POS_LEFT ||
handle_position == GTK_POS_RIGHT)
{ {
requisition->width = DRAG_HANDLE_SIZE; requisition->width = DRAG_HANDLE_SIZE;
requisition->height = 0; requisition->height = 0;
@ -520,16 +549,16 @@ gtk_handle_box_size_request (GtkWidget *widget,
/* FIXME: This doesn't work currently */ /* FIXME: This doesn't work currently */
if (!hb->shrink_on_detach) if (!hb->shrink_on_detach)
{ {
if (hb->handle_position == GTK_POS_LEFT || if (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) handle_position == GTK_POS_RIGHT)
requisition->height += child_requisition.height; requisition->height += child_requisition.height;
else else
requisition->width += child_requisition.width; requisition->width += child_requisition.width;
} }
else else
{ {
if (hb->handle_position == GTK_POS_LEFT || if (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) handle_position == GTK_POS_RIGHT)
requisition->height += widget->style->ythickness; requisition->height += widget->style->ythickness;
else else
requisition->width += widget->style->xthickness; requisition->width += widget->style->xthickness;
@ -560,10 +589,13 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
GtkBin *bin; GtkBin *bin;
GtkHandleBox *hb; GtkHandleBox *hb;
GtkRequisition child_requisition; GtkRequisition child_requisition;
gint handle_position;
bin = GTK_BIN (widget); bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget); hb = GTK_HANDLE_BOX (widget);
handle_position = effective_handle_position (hb);
if (bin->child) if (bin->child)
gtk_widget_get_child_requisition (bin->child, &child_requisition); gtk_widget_get_child_requisition (bin->child, &child_requisition);
else else
@ -593,9 +625,9 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
child_allocation.x = border_width; child_allocation.x = border_width;
child_allocation.y = border_width; child_allocation.y = border_width;
if (hb->handle_position == GTK_POS_LEFT) if (handle_position == GTK_POS_LEFT)
child_allocation.x += DRAG_HANDLE_SIZE; child_allocation.x += DRAG_HANDLE_SIZE;
else if (hb->handle_position == GTK_POS_TOP) else if (handle_position == GTK_POS_TOP)
child_allocation.y += DRAG_HANDLE_SIZE; child_allocation.y += DRAG_HANDLE_SIZE;
if (hb->child_detached) if (hb->child_detached)
@ -609,8 +641,8 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
float_width = child_allocation.width + 2 * border_width; float_width = child_allocation.width + 2 * border_width;
float_height = child_allocation.height + 2 * border_width; float_height = child_allocation.height + 2 * border_width;
if (hb->handle_position == GTK_POS_LEFT || if (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) handle_position == GTK_POS_RIGHT)
float_width += DRAG_HANDLE_SIZE; float_width += DRAG_HANDLE_SIZE;
else else
float_height += DRAG_HANDLE_SIZE; float_height += DRAG_HANDLE_SIZE;
@ -632,8 +664,8 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
child_allocation.width = MAX (1, (gint)widget->allocation.width - 2 * border_width); child_allocation.width = MAX (1, (gint)widget->allocation.width - 2 * border_width);
child_allocation.height = MAX (1, (gint)widget->allocation.height - 2 * border_width); child_allocation.height = MAX (1, (gint)widget->allocation.height - 2 * border_width);
if (hb->handle_position == GTK_POS_LEFT || if (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) handle_position == GTK_POS_RIGHT)
child_allocation.width -= DRAG_HANDLE_SIZE; child_allocation.width -= DRAG_HANDLE_SIZE;
else else
child_allocation.height -= DRAG_HANDLE_SIZE; child_allocation.height -= DRAG_HANDLE_SIZE;
@ -658,13 +690,15 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
guint y; guint y;
guint width; guint width;
guint height; guint height;
gint handle_position;
widget = GTK_WIDGET (hb); widget = GTK_WIDGET (hb);
if (hb->handle_position == GTK_POS_LEFT || handle_position = effective_handle_position (hb);
hb->handle_position == GTK_POS_RIGHT) if (handle_position == GTK_POS_LEFT ||
handle_position == GTK_POS_RIGHT)
{ {
x = hb->handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width - DRAG_HANDLE_SIZE; x = handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width - DRAG_HANDLE_SIZE;
y = 0; y = 0;
width = DRAG_HANDLE_SIZE; width = DRAG_HANDLE_SIZE;
height = widget->allocation.height; height = widget->allocation.height;
@ -672,7 +706,7 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
else else
{ {
x = 0; x = 0;
y = hb->handle_position == GTK_POS_TOP ? 0 : widget->allocation.height - DRAG_HANDLE_SIZE; y = handle_position == GTK_POS_TOP ? 0 : widget->allocation.height - DRAG_HANDLE_SIZE;
width = widget->allocation.width; width = widget->allocation.width;
height = DRAG_HANDLE_SIZE; height = DRAG_HANDLE_SIZE;
} }
@ -685,22 +719,22 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
y, y,
width, width,
height); height);
if (hb->handle_position == GTK_POS_LEFT || if (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) handle_position == GTK_POS_RIGHT)
gtk_paint_hline (widget->style, gtk_paint_hline (widget->style,
widget->window, widget->window,
GTK_WIDGET_STATE (widget), GTK_WIDGET_STATE (widget),
NULL, widget, "handlebox", NULL, widget, "handlebox",
hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0, handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
hb->handle_position == GTK_POS_LEFT ? widget->allocation.width : widget->allocation.width - DRAG_HANDLE_SIZE, handle_position == GTK_POS_LEFT ? widget->allocation.width : widget->allocation.width - DRAG_HANDLE_SIZE,
widget->allocation.height / 2); widget->allocation.height / 2);
else else
gtk_paint_vline (widget->style, gtk_paint_vline (widget->style,
widget->window, widget->window,
GTK_WIDGET_STATE (widget), GTK_WIDGET_STATE (widget),
NULL, widget, "handlebox", NULL, widget, "handlebox",
hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0, handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
hb->handle_position == GTK_POS_TOP ? widget->allocation.height : widget->allocation.height - DRAG_HANDLE_SIZE, handle_position == GTK_POS_TOP ? widget->allocation.height : widget->allocation.height - DRAG_HANDLE_SIZE,
widget->allocation.width / 2); widget->allocation.width / 2);
} }
@ -809,6 +843,7 @@ gtk_handle_box_get_snap_edge (GtkHandleBox *handle_box)
static void static void
gtk_handle_box_paint (GtkWidget *widget, gtk_handle_box_paint (GtkWidget *widget,
GdkEventExpose *event, GdkEventExpose *event,
GdkRectangle *area) GdkRectangle *area)
{ {
@ -818,10 +853,13 @@ gtk_handle_box_paint (GtkWidget *widget,
guint height; guint height;
GdkRectangle rect; GdkRectangle rect;
GdkRectangle dest; GdkRectangle dest;
gint handle_position;
bin = GTK_BIN (widget); bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget); hb = GTK_HANDLE_BOX (widget);
handle_position = effective_handle_position (hb);
gdk_drawable_get_size (hb->bin_window, &width, &height); gdk_drawable_get_size (hb->bin_window, &width, &height);
if (!event) if (!event)
@ -847,7 +885,7 @@ gtk_handle_box_paint (GtkWidget *widget,
width, width,
height);*/ height);*/
switch (hb->handle_position) switch (handle_position)
{ {
case GTK_POS_LEFT: case GTK_POS_LEFT:
rect.x = 0; rect.x = 0;
@ -913,9 +951,12 @@ gtk_handle_box_button_changed (GtkWidget *widget,
GtkHandleBox *hb; GtkHandleBox *hb;
gboolean event_handled; gboolean event_handled;
GdkCursor *fleur; GdkCursor *fleur;
gint handle_position;
hb = GTK_HANDLE_BOX (widget); hb = GTK_HANDLE_BOX (widget);
handle_position = effective_handle_position (hb);
event_handled = FALSE; event_handled = FALSE;
if ((event->button == 1) && if ((event->button == 1) &&
(event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS)) (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS))
@ -930,7 +971,7 @@ gtk_handle_box_button_changed (GtkWidget *widget,
if (child) if (child)
{ {
switch (hb->handle_position) switch (handle_position)
{ {
case GTK_POS_LEFT: case GTK_POS_LEFT:
in_handle = event->x < DRAG_HANDLE_SIZE; in_handle = event->x < DRAG_HANDLE_SIZE;
@ -1030,6 +1071,7 @@ gtk_handle_box_motion (GtkWidget *widget,
gint new_x, new_y; gint new_x, new_y;
gint snap_edge; gint snap_edge;
gboolean is_snapped = FALSE; gboolean is_snapped = FALSE;
gint handle_position;
hb = GTK_HANDLE_BOX (widget); hb = GTK_HANDLE_BOX (widget);
if (!hb->in_drag) if (!hb->in_drag)
@ -1038,6 +1080,8 @@ gtk_handle_box_motion (GtkWidget *widget,
if (!hb->in_drag || (event->window != widget->window)) if (!hb->in_drag || (event->window != widget->window))
return FALSE; return FALSE;
handle_position = effective_handle_position (hb);
/* Calculate the attachment point on the float, if the float /* Calculate the attachment point on the float, if the float
* were detached * were detached
*/ */
@ -1050,10 +1094,23 @@ gtk_handle_box_motion (GtkWidget *widget,
snap_edge = hb->snap_edge; snap_edge = hb->snap_edge;
if (snap_edge == -1) if (snap_edge == -1)
snap_edge = (hb->handle_position == GTK_POS_LEFT || snap_edge = (handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT) ? handle_position == GTK_POS_RIGHT) ?
GTK_POS_TOP : GTK_POS_LEFT; GTK_POS_TOP : GTK_POS_LEFT;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
switch (snap_edge)
{
case GTK_POS_LEFT:
snap_edge = GTK_POS_RIGHT;
break;
case GTK_POS_RIGHT:
snap_edge = GTK_POS_LEFT;
break;
default:
break;
}
/* First, check if the snapped edge is aligned /* First, check if the snapped edge is aligned
*/ */
switch (snap_edge) switch (snap_edge)
@ -1132,7 +1189,7 @@ gtk_handle_box_motion (GtkWidget *widget,
new_x += hb->deskoff_x; new_x += hb->deskoff_x;
new_y += hb->deskoff_y; new_y += hb->deskoff_y;
switch (hb->handle_position) switch (handle_position)
{ {
case GTK_POS_LEFT: case GTK_POS_LEFT:
new_y += ((gint)hb->float_allocation.height - height) / 2; new_y += ((gint)hb->float_allocation.height - height) / 2;
@ -1174,7 +1231,7 @@ gtk_handle_box_motion (GtkWidget *widget,
width = child_requisition.width + 2 * GTK_CONTAINER (hb)->border_width; width = child_requisition.width + 2 * GTK_CONTAINER (hb)->border_width;
height = child_requisition.height + 2 * GTK_CONTAINER (hb)->border_width; height = child_requisition.height + 2 * GTK_CONTAINER (hb)->border_width;
if (hb->handle_position == GTK_POS_LEFT || hb->handle_position == GTK_POS_RIGHT) if (handle_position == GTK_POS_LEFT || handle_position == GTK_POS_RIGHT)
width += DRAG_HANDLE_SIZE; width += DRAG_HANDLE_SIZE;
else else
height += DRAG_HANDLE_SIZE; height += DRAG_HANDLE_SIZE;