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

label: Remove some unneeded conditionals

Browse Source 
We are never passing NULL here.
This commit is contained in:
Timm Bäder 2016-01-13 19:07:20 +01:00
parent 6a97b2563b
commit 2397d76137
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtklabel.c
View File

@ -4584,26 +4584,16 @@ window_to_layout_coords (GtkLabel *label,
{
GtkAllocation allocation;
gint lx, ly;
GtkWidget *widget;
widget = GTK_WIDGET (label);
/* get layout location in widget->window coords */
get_layout_location (label, &lx, &ly);
gtk_widget_get_allocation (GTK_WIDGET (label), &allocation);
gtk_widget_get_allocation (widget, &allocation);
*x += allocation.x; /* go to widget->window */
*x -= lx; /* go to layout */
if (x)
{
*x += allocation.x; /* go to widget->window */
*x -= lx; /* go to layout */
}
if (y)
{
*y += allocation.y; /* go to widget->window */
*y -= ly; /* go to layout */
}
*y += allocation.y; /* go to widget->window */
*y -= ly; /* go to layout */
}
static void
@ -4612,26 +4602,17 @@ layout_to_window_coords (GtkLabel *label,
gint *y)
{
gint lx, ly;
GtkWidget *widget;
GtkAllocation allocation;
widget = GTK_WIDGET (label);
/* get layout location in widget->window coords */
get_layout_location (label, &lx, &ly);
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_get_allocation (GTK_WIDGET (label), &allocation);
if (x)
{
*x += lx; /* go to widget->window */
*x -= allocation.x; /* go to selection window */
}
*x += lx; /* go to widget->window */
*x -= allocation.x; /* go to selection window */
if (y)
{
*y += ly; /* go to widget->window */
*y -= allocation.y; /* go to selection window */
}
*y += ly; /* go to widget->window */
*y -= allocation.y; /* go to selection window */
}
static gboolean