forked from AuroraMiddleware/gtk
widget: Remove special case for clipping
Labels now call gtk_widget_set_clip() so there is no longer a need to exclude them from clipping.
This commit is contained in:
parent
37030a7710
commit
3e82d12abd
@ -6922,20 +6922,6 @@ gtk_cairo_should_draw_window (cairo_t *cr,
|
|||||||
event_window == window;
|
event_window == window;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
gtk_widget_get_clip_draw (GtkWidget *widget)
|
|
||||||
{
|
|
||||||
/* labels are not clipped, because clipping them would cause
|
|
||||||
* mnemonics to not appear on characters that go beyond the
|
|
||||||
* baseline.
|
|
||||||
* https://bugzilla.gnome.org/show_bug.cgi?id=648570
|
|
||||||
*/
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_gtk_widget_draw_internal (GtkWidget *widget,
|
_gtk_widget_draw_internal (GtkWidget *widget,
|
||||||
cairo_t *cr,
|
cairo_t *cr,
|
||||||
@ -6950,8 +6936,6 @@ _gtk_widget_draw_internal (GtkWidget *widget,
|
|||||||
tmp_event_window = _gtk_cairo_get_event_window (cr);
|
tmp_event_window = _gtk_cairo_get_event_window (cr);
|
||||||
gtk_cairo_set_event_window (cr, window);
|
gtk_cairo_set_event_window (cr, window);
|
||||||
|
|
||||||
clip_to_size &= gtk_widget_get_clip_draw (widget);
|
|
||||||
|
|
||||||
if (clip_to_size)
|
if (clip_to_size)
|
||||||
{
|
{
|
||||||
cairo_rectangle (cr,
|
cairo_rectangle (cr,
|
||||||
|
Loading…
Reference in New Issue
Block a user