AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 00:11:29 +00:00
Code Issues Projects Releases Wiki Activity

entry: Use gdk_window_new_input()

Browse Source
This commit is contained in:
Benjamin Otte 2016-10-17 20:15:05 +02:00
parent 9d2309cc39
commit c61e669e56
1 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gtk/gtkentry.c
View File

@ -2887,30 +2887,19 @@ realize_icon_info (GtkWidget *widget,
GtkEntry *entry = GTK_ENTRY (widget); GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = entry->priv; GtkEntryPrivate *priv = entry->priv;
EntryIconInfo *icon_info = priv->icons[icon_pos]; EntryIconInfo *icon_info = priv->icons[icon_pos];
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (icon_info != NULL); g_return_if_fail (icon_info != NULL);
attributes.x = 0; icon_info->window = gdk_window_new_input (gtk_widget_get_window (widget),
attributes.y = 0; gtk_widget_get_events (widget)
attributes.width = 1; | GDK_BUTTON_PRESS_MASK
attributes.height = 1; | GDK_BUTTON_RELEASE_MASK
attributes.window_type = GDK_WINDOW_CHILD; | GDK_BUTTON1_MOTION_MASK
attributes.wclass = GDK_INPUT_ONLY; | GDK_BUTTON3_MOTION_MASK
attributes.event_mask = gtk_widget_get_events (widget); | GDK_POINTER_MOTION_MASK
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | | GDK_ENTER_NOTIFY_MASK
GDK_BUTTON_RELEASE_MASK | | GDK_LEAVE_NOTIFY_MASK,
GDK_BUTTON1_MOTION_MASK | &(GdkRectangle) { 0, 0, 1, 1});
GDK_BUTTON3_MOTION_MASK |
GDK_POINTER_MOTION_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
attributes_mask = GDK_WA_X | GDK_WA_Y;
icon_info->window = gdk_window_new (gtk_widget_get_window (widget),
&attributes,
attributes_mask);
gtk_widget_register_window (widget, icon_info->window); gtk_widget_register_window (widget, icon_info->window);
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
@ -3096,8 +3085,6 @@ gtk_entry_realize (GtkWidget *widget)
GtkEntry *entry; GtkEntry *entry;
GtkEntryPrivate *priv; GtkEntryPrivate *priv;
EntryIconInfo *icon_info; EntryIconInfo *icon_info;
GdkWindowAttr attributes;
gint attributes_mask;
int i; int i;
GTK_WIDGET_CLASS (gtk_entry_parent_class)->realize (widget); GTK_WIDGET_CLASS (gtk_entry_parent_class)->realize (widget);
@ -3105,26 +3092,16 @@ gtk_entry_realize (GtkWidget *widget)
entry = GTK_ENTRY (widget); entry = GTK_ENTRY (widget);
priv = entry->priv; priv = entry->priv;
attributes.window_type = GDK_WINDOW_CHILD; priv->text_area = gdk_window_new_input (gtk_widget_get_window (widget),
attributes.wclass = GDK_INPUT_ONLY; gtk_widget_get_events (widget)
attributes.event_mask = gtk_widget_get_events (widget); | GDK_BUTTON_PRESS_MASK
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | | GDK_BUTTON_RELEASE_MASK
GDK_BUTTON_RELEASE_MASK | | GDK_BUTTON1_MOTION_MASK
GDK_BUTTON1_MOTION_MASK | | GDK_BUTTON3_MOTION_MASK
GDK_BUTTON3_MOTION_MASK | | GDK_POINTER_MOTION_MASK
GDK_POINTER_MOTION_MASK | | GDK_ENTER_NOTIFY_MASK
GDK_ENTER_NOTIFY_MASK | | GDK_LEAVE_NOTIFY_MASK,
GDK_LEAVE_NOTIFY_MASK); &priv->text_allocation);
attributes_mask = GDK_WA_X | GDK_WA_Y;
attributes.x = priv->text_allocation.x;
attributes.y = priv->text_allocation.y;
attributes.width = priv->text_allocation.width;
attributes.height = priv->text_allocation.height;
priv->text_area = gdk_window_new (gtk_widget_get_window (widget),
&attributes,
attributes_mask);
if (gtk_widget_is_sensitive (widget)) if (gtk_widget_is_sensitive (widget))
{ {