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

texthandle: Fix shape setup on non-composited environments

Browse Source 
The check on the handle to be drawn on the mask was based on the yet to
be set priv->windows pointers, pass explicitly the handle position to
have the shape correctly initialized on non-composited environments
This commit is contained in:
Carlos Garnacho 2012-10-26 17:46:40 +02:00
parent 237e984a52
commit f6952ceb82
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtktexthandle.c
View File

@ -122,8 +122,9 @@ _gtk_text_handle_draw (GtkTextHandle *handle,
} }
static void static void
_gtk_text_handle_update_shape (GtkTextHandle *handle, _gtk_text_handle_update_shape (GtkTextHandle *handle,
GdkWindow *window) GdkWindow *window,
GtkTextHandlePosition pos)
{ {
GtkTextHandlePrivate *priv; GtkTextHandlePrivate *priv;
@ -133,18 +134,10 @@ _gtk_text_handle_update_shape (GtkTextHandle *handle,
gdk_window_shape_combine_region (window, NULL, 0, 0); gdk_window_shape_combine_region (window, NULL, 0, 0);
else else
{ {
GtkTextHandlePosition pos;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_region_t *region; cairo_region_t *region;
cairo_t *cr; cairo_t *cr;
if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window)
pos = GTK_TEXT_HANDLE_POSITION_SELECTION_START;
else if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window)
pos = GTK_TEXT_HANDLE_POSITION_SELECTION_END;
else
return;
surface = surface =
gdk_window_create_similar_surface (window, gdk_window_create_similar_surface (window,
CAIRO_CONTENT_COLOR_ALPHA, CAIRO_CONTENT_COLOR_ALPHA,
@ -164,7 +157,8 @@ _gtk_text_handle_update_shape (GtkTextHandle *handle,
} }
static GdkWindow * static GdkWindow *
_gtk_text_handle_create_window (GtkTextHandle *handle) _gtk_text_handle_create_window (GtkTextHandle *handle,
GtkTextHandlePosition pos)
{ {
GtkTextHandlePrivate *priv; GtkTextHandlePrivate *priv;
GdkRGBA bg = { 0, 0, 0, 0 }; GdkRGBA bg = { 0, 0, 0, 0 };
@ -200,7 +194,7 @@ _gtk_text_handle_create_window (GtkTextHandle *handle)
gdk_window_set_user_data (window, priv->parent); gdk_window_set_user_data (window, priv->parent);
gdk_window_set_background_rgba (window, &bg); gdk_window_set_background_rgba (window, &bg);
_gtk_text_handle_update_shape (handle, window); _gtk_text_handle_update_shape (handle, window, pos);
return window; return window;
} }
@ -307,7 +301,7 @@ _gtk_text_handle_update_window (GtkTextHandle *handle,
gdk_window_destroy (handle_window->window); gdk_window_destroy (handle_window->window);
/* Create new window and apply old state */ /* Create new window and apply old state */
handle_window->window = _gtk_text_handle_create_window (handle); handle_window->window = _gtk_text_handle_create_window (handle, pos);
if (visible) if (visible)
{ {
@ -531,9 +525,9 @@ _gtk_text_handle_set_relative_to (GtkTextHandle *handle,
{ {
priv->relative_to = g_object_ref (window); priv->relative_to = g_object_ref (window);
priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window = priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window =
_gtk_text_handle_create_window (handle); _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_START);
priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window = priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window =
_gtk_text_handle_create_window (handle); _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_END);
priv->realized = TRUE; priv->realized = TRUE;
} }
else else