make it compile
This commit is contained in:
Matthias Clasen
parent
e8108e009d
commit
6555f88a42
@ -1,6 +1,6 @@
|
||||
diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.c
|
||||
--- gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips 2010-09-10 09:05:50.000000000 -0400
|
||||
+++ gtk+-2.90.7/gtk/gtktooltip.c 2010-09-21 13:57:08.491301998 -0400
|
||||
+++ gtk+-2.90.7/gtk/gtktooltip.c 2010-09-21 20:00:48.705997994 -0400
|
||||
@@ -33,6 +33,9 @@
|
||||
#include "gtkhbox.h"
|
||||
#include "gtkalignment.h"
|
||||
@ -19,7 +19,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
|
||||
|
||||
G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
|
||||
@@ -111,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass
|
||||
@@ -111,6 +115,40 @@ gtk_tooltip_class_init (GtkTooltipClass
|
||||
}
|
||||
|
||||
static void
|
||||
@ -44,7 +44,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ if (gdk_screen_is_composited (screen))
|
||||
+ cmap = gdk_screen_get_rgba_colormap (screen);
|
||||
+ if (cmap == NULL)
|
||||
+ cmap = gdk_screen_get_rgb_colormap (screen);
|
||||
+ cmap = gdk_screen_get_system_colormap (screen);
|
||||
+
|
||||
+ gtk_widget_set_colormap (window, cmap);
|
||||
+}
|
||||
@ -59,11 +59,8 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+static void
|
||||
gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
{
|
||||
+ GdkScreen *screen;
|
||||
GtkStyle *style;
|
||||
|
||||
tooltip->timeout_id = 0;
|
||||
@@ -130,8 +169,12 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
@@ -130,8 +168,12 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
tooltip->last_window = NULL;
|
||||
|
||||
tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
|
||||
@ -76,7 +73,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
gtk_widget_set_app_paintable (tooltip->window, TRUE);
|
||||
gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
|
||||
gtk_widget_set_name (tooltip->window, "gtk-tooltip");
|
||||
@@ -148,7 +191,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
@@ -148,7 +190,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
gtk_widget_show (tooltip->alignment);
|
||||
|
||||
g_signal_connect_swapped (tooltip->window, "style-set",
|
||||
@ -85,7 +82,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
g_signal_connect_swapped (tooltip->window, "expose-event",
|
||||
G_CALLBACK (gtk_tooltip_paint_window), tooltip);
|
||||
|
||||
@@ -165,6 +208,13 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
@@ -165,6 +207,13 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
|
||||
FALSE, FALSE, 0);
|
||||
|
||||
@ -99,7 +96,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
tooltip->custom_widget = NULL;
|
||||
}
|
||||
|
||||
@@ -514,21 +564,210 @@ gtk_tooltip_window_style_set (GtkTooltip
|
||||
@@ -514,21 +563,216 @@ gtk_tooltip_window_style_set (GtkTooltip
|
||||
gtk_widget_queue_draw (tooltip->window);
|
||||
}
|
||||
|
||||
@ -159,32 +156,38 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ gdouble r, g, b;
|
||||
+ gint radius;
|
||||
+ gdouble background_alpha;
|
||||
+ GtkStyle *style;
|
||||
+ GtkAllocation allocation;
|
||||
+
|
||||
+ if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
|
||||
+ background_alpha = 0.90;
|
||||
+ else
|
||||
+ background_alpha = 1.0;
|
||||
+
|
||||
+ radius = MIN (widget->style->xthickness, widget->style->ythickness);
|
||||
+ style = gtk_widget_get_style (widget);
|
||||
+
|
||||
+ radius = MIN (style->xthickness, style->ythickness);
|
||||
+ radius = MAX (radius, 1);
|
||||
+
|
||||
+ cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
|
||||
+ cairo_paint (cr);
|
||||
+ cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
|
||||
+
|
||||
+ gtk_widget_get_allocation (widget, &allocation);
|
||||
+
|
||||
+ draw_round_rect (cr,
|
||||
+ 1.0, 0.5, 0.5, radius,
|
||||
+ widget->allocation.width - 1,
|
||||
+ widget->allocation.height - 1);
|
||||
+ allocation.width - 1,
|
||||
+ allocation.height - 1);
|
||||
+
|
||||
+ color = widget->style->bg [GTK_STATE_NORMAL];
|
||||
+ color = style->bg [GTK_STATE_NORMAL];
|
||||
+ r = (float)color.red / 65535.0;
|
||||
+ g = (float)color.green / 65535.0;
|
||||
+ b = (float)color.blue / 65535.0;
|
||||
+ cairo_set_source_rgba (cr, r, g, b, background_alpha);
|
||||
+ cairo_fill_preserve (cr);
|
||||
+
|
||||
+ color = widget->style->bg [GTK_STATE_SELECTED];
|
||||
+ color = style->bg [GTK_STATE_SELECTED];
|
||||
+ r = (float) color.red / 65535.0;
|
||||
+ g = (float) color.green / 65535.0;
|
||||
+ b = (float) color.blue / 65535.0;
|
||||
@ -203,6 +206,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ gint width, height;
|
||||
+ gboolean new_style;
|
||||
+ gint radius;
|
||||
+ GtkStyle *style;
|
||||
+
|
||||
+ gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL);
|
||||
+
|
||||
@ -213,12 +217,12 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ }
|
||||
+
|
||||
+ screen = gtk_widget_get_screen (tooltip->window);
|
||||
+ style = gtk_widget_get_style (tooltip->window);
|
||||
+
|
||||
+ gtk_window_get_size (GTK_WINDOW (tooltip->window), &width, &height);
|
||||
+
|
||||
+ if (gdk_screen_is_composited (screen))
|
||||
+ {
|
||||
+ GdkRectangle rect;
|
||||
+ const char *wm;
|
||||
+
|
||||
+ gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
|
||||
@ -237,8 +241,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ radius = MIN (tooltip->window->style->xthickness,
|
||||
+ tooltip->window->style->ythickness);
|
||||
+ radius = MIN (style->xthickness, style->ythickness);
|
||||
+ radius = MAX (radius, 1);
|
||||
+ mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
|
||||
+ cr = gdk_cairo_create (mask);
|
||||
@ -284,7 +287,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ cairo_surface_t *surface;
|
||||
+ cairo_t *cr;
|
||||
+
|
||||
+ context = gdk_cairo_create (tooltip->window->window);
|
||||
+ context = gdk_cairo_create (gtk_widget_get_window (tooltip->window));
|
||||
+
|
||||
+ cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
|
||||
+ surface = cairo_surface_create_similar (cairo_get_target (context),
|
||||
@ -305,8 +308,8 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ gtk_paint_flat_box (tooltip->window->style,
|
||||
+ tooltip->window->window,
|
||||
+ gtk_paint_flat_box (gtk_widget_get_style (tooltip->window),
|
||||
+ gtk_widget_get_window (tooltip->window),
|
||||
+ GTK_STATE_NORMAL,
|
||||
+ GTK_SHADOW_OUT,
|
||||
+ NULL,
|
||||
@ -321,7 +324,7 @@ diff -up gtk+-2.90.7/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.7/gtk/gtktooltip.
|
||||
}
|
||||
diff -up gtk+-2.90.7/gtk/gtkwidget.c.fresh-tooltips gtk+-2.90.7/gtk/gtkwidget.c
|
||||
--- gtk+-2.90.7/gtk/gtkwidget.c.fresh-tooltips 2010-09-10 09:05:50.000000000 -0400
|
||||
+++ gtk+-2.90.7/gtk/gtkwidget.c 2010-09-21 13:45:51.243302001 -0400
|
||||
+++ gtk+-2.90.7/gtk/gtkwidget.c 2010-09-21 13:57:38.327302001 -0400
|
||||
@@ -2649,6 +2649,14 @@ gtk_widget_class_init (GtkWidgetClass *k
|
||||
1, G_MAXINT, 16,
|
||||
GTK_PARAM_READABLE));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user