[gtk/wip/baedert/for-master] widget: Remove queue_resize_no_redraw



commit 264d4bada615ca588953e47af32abe6f33bcea3f
Author: Timm Bäder <mail baedert org>
Date:   Sun Jul 7 07:43:08 2019 +0200

    widget: Remove queue_resize_no_redraw
    
    We always invalidate the widget in size_allocate() anyway.

 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkcalendar.c                    |  4 ++--
 gtk/gtktextview.c                    |  2 +-
 gtk/gtktoolbar.c                     |  8 ++++----
 gtk/gtktreeview.c                    |  4 ++--
 gtk/gtkwidget.c                      | 15 ---------------
 gtk/gtkwidget.h                      |  2 --
 gtk/gtkwindow.c                      |  8 ++++----
 8 files changed, 13 insertions(+), 31 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 5c6108bc44..a20c4d302e 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4432,7 +4432,6 @@ gtk_widget_realize
 gtk_widget_unrealize
 gtk_widget_queue_draw
 gtk_widget_queue_resize
-gtk_widget_queue_resize_no_redraw
 gtk_widget_queue_allocate
 gtk_widget_get_frame_clock
 gtk_widget_get_scale_factor
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 0b45d241f2..b8acd5bd2f 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3474,7 +3474,7 @@ gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
     {
       priv->detail_width_chars = chars;
       g_object_notify (G_OBJECT (calendar), "detail-width-chars");
-      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+      gtk_widget_queue_resize (GTK_WIDGET (calendar));
     }
 }
 
@@ -3498,7 +3498,7 @@ gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
     {
       priv->detail_height_rows = rows;
       g_object_notify (G_OBJECT (calendar), "detail-height-rows");
-      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+      gtk_widget_queue_resize (GTK_WIDGET (calendar));
     }
 }
 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index eeede5d3a6..baaf8e4bff 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4449,7 +4449,7 @@ changed_handler (GtkTextLayout     *layout,
 
           tmp_list = tmp_list->next;
         }
-      gtk_widget_queue_resize_no_redraw(widget);
+      gtk_widget_queue_resize(widget);
     }
 }
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 93ecd03c04..667d80961c 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -933,13 +933,13 @@ slide_idle_handler (gpointer data)
       
       if (cont)
        {
-         gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+         gtk_widget_queue_resize (GTK_WIDGET (toolbar));
          
          return TRUE;
        }
     }
   
-  gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+  gtk_widget_queue_resize (GTK_WIDGET (toolbar));
 
   priv->is_sliding = FALSE;
   priv->idle_id = 0;
@@ -1052,7 +1052,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
    * so that the idle handler will not immediately return
    * FALSE
    */
-  gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+  gtk_widget_queue_resize (GTK_WIDGET (toolbar));
   g_timer_reset (priv->timer);
 }
 
@@ -1086,7 +1086,7 @@ gtk_toolbar_stop_sliding (GtkToolbar *toolbar)
            }
        }
       
-      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+      gtk_widget_queue_resize (GTK_WIDGET (toolbar));
     }
 }
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index a73c54a6c6..5db4a159e2 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6311,7 +6311,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
                                 MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), 
requisition.height));
 
       if (queue_resize)
-        gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
+        gtk_widget_queue_resize (GTK_WIDGET (tree_view));
     }
 
   if (path) gtk_tree_path_free (path);
@@ -8319,7 +8319,7 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
       if (node_visible && node_is_visible (tree_view, tree, tmpnode))
        gtk_widget_queue_resize (GTK_WIDGET (tree_view));
       else
-       gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
+        gtk_widget_queue_resize (GTK_WIDGET (tree_view));
     }
   else
     install_presize_handler (tree_view);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ceda569793..6bd8ab73ce 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4161,21 +4161,6 @@ gtk_widget_queue_resize (GtkWidget *widget)
   gtk_widget_queue_resize_internal (widget);
 }
 
-/**
- * gtk_widget_queue_resize_no_redraw:
- * @widget: a #GtkWidget
- *
- * This function works like gtk_widget_queue_resize(),
- * except that the widget is not invalidated.
- **/
-void
-gtk_widget_queue_resize_no_redraw (GtkWidget *widget)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  gtk_widget_queue_resize_internal (widget);
-}
-
 /**
  * gtk_widget_get_frame_clock:
  * @widget: a #GtkWidget
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index f9a3d50005..3f383ad2a9 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -375,8 +375,6 @@ void       gtk_widget_queue_draw          (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_queue_resize        (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void       gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
-GDK_AVAILABLE_IN_ALL
 void       gtk_widget_queue_allocate      (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget           *widget);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index dab50be990..963d1fa088 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4367,7 +4367,7 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
   
   g_object_thaw_notify (G_OBJECT (window));
   
-  gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window));
+  gtk_widget_queue_resize (GTK_WIDGET (window));
 }
 
 /**
@@ -4498,7 +4498,7 @@ gtk_window_resize (GtkWindow *window,
   info->resize_width = width;
   info->resize_height = height;
 
-  gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window));
+  gtk_widget_queue_resize (GTK_WIDGET (window));
 }
 
 /**
@@ -7129,7 +7129,7 @@ gtk_window_move_resize (GtkWindow *window)
            * to postpone our configure request until later.
            */
          info->last = saved_last_info;
-         gtk_widget_queue_resize_no_redraw (widget); /* might recurse for GTK_RESIZE_IMMEDIATE */
+         gtk_widget_queue_resize (widget); /* might recurse for GTK_RESIZE_IMMEDIATE */
        }
 
       return;                  /* Bail out, we didn't really process the move/resize */
@@ -7963,7 +7963,7 @@ gtk_window_set_resizable (GtkWindow *window,
 
       update_window_buttons (window);
 
-      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window));
+      gtk_widget_queue_resize (GTK_WIDGET (window));
 
       g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_RESIZABLE]);
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]