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

dnd: Set attributes from all widgets for text drag icons

Browse Source 
There is nothing textview-specific here.
This commit is contained in:
Matthias Clasen 2016-04-26 21:23:08 -04:00
parent 7449add82b
commit 23df86e923
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktextutil.c
View File

@ -254,14 +254,12 @@ _gtk_text_util_create_drag_icon (GtkWidget *widget,
} }
static void static void
gtk_text_view_set_attributes_from_style (GtkTextView *text_view, set_attributes_from_style (GtkStyleContext *context,
GtkTextAttributes *values) GtkTextAttributes *values)
{ {
GtkStyleContext *context;
GdkRGBA bg_color, fg_color; GdkRGBA bg_color, fg_color;
GtkStateFlags state; GtkStateFlags state;
context = gtk_widget_get_style_context (GTK_WIDGET (text_view));
state = gtk_style_context_get_state (context); state = gtk_style_context_get_state (context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@ -328,10 +326,10 @@ _gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
layout_width = allocation.width; layout_width = allocation.width;
set_attributes_from_style (gtk_widget_get_style_context (widget), style);
if (GTK_IS_TEXT_VIEW (widget)) if (GTK_IS_TEXT_VIEW (widget))
{ {
gtk_text_view_set_attributes_from_style (GTK_TEXT_VIEW (widget), style);
layout_width = layout_width layout_width = layout_width
- gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT) - gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT)
- gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_RIGHT); - gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_RIGHT);