[gtk/matthiasc/for-master] gtk-demo: Cosmetic changes

[Matthias Clasen <matthiasc src gnome org>]

commit a8adbfbc9f7f7e1f8efced4fcacbf969e79864b1
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 17 15:45:29 2020 -0400

    gtk-demo: Cosmetic changes
    
    Polish the text view demos a little bit.

 demos/gtk-demo/sidebar.c  |  7 +++----
 demos/gtk-demo/tabs.c     |  9 ++++++---
 demos/gtk-demo/textundo.c | 20 +++++++++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index c7ca861b55..666129463e 100644
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -1,9 +1,9 @@
 /* Stack Sidebar
  *
  * GtkStackSidebar provides an automatic sidebar widget to control
- * navigation of a GtkStack object. This widget automatically updates it
- * content based on what is presently available in the GtkStack object,
- * and using the "title" child property to set the display labels.
+ * navigation of a GtkStack object. This widget automatically updates
+ * its content based on what is presently available in the GtkStack
+ * object, and using the "title" child property to set the display labels.
  */
 
 #include <glib/gi18n.h>
@@ -37,7 +37,6 @@ do_sidebar (GtkWidget *do_widget)
     {
       window = gtk_window_new ();
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_widget_set_size_request (window, 500, 350);
 
       header = gtk_header_bar_new ();
       gtk_window_set_titlebar (GTK_WINDOW(window), header);
diff --git a/demos/gtk-demo/tabs.c b/demos/gtk-demo/tabs.c
index e683076d02..aaa33af822 100644
--- a/demos/gtk-demo/tabs.c
+++ b/demos/gtk-demo/tabs.c
@@ -22,18 +22,21 @@ do_tabs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Tabs");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
+      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
+      gtk_text_view_set_top_margin (GTK_TEXT_VIEW (view), 20);
+      gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW (view), 20);
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
       gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
 
       tabs = pango_tab_array_new (3, TRUE);
       pango_tab_array_set_tab (tabs, 0, PANGO_TAB_LEFT, 0);
-      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 150);
-      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 300);
+      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 100);
+      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 200);
       gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tabs);
       pango_tab_array_free (tabs);
 
diff --git a/demos/gtk-demo/textundo.c b/demos/gtk-demo/textundo.c
index 0bd7851f3a..f1fe41853e 100644
--- a/demos/gtk-demo/textundo.c
+++ b/demos/gtk-demo/textundo.c
@@ -26,13 +26,20 @@ do_textundo (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
+      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Undo and Redo");
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (view), 10);
+      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
+      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
+      gtk_text_view_set_top_margin (GTK_TEXT_VIEW (view), 20);
+      gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW (view), 20);
+
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
@@ -40,10 +47,13 @@ do_textundo (GtkWidget *do_widget)
       gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_get_start_iter (buffer, &iter);
       gtk_text_buffer_insert (buffer, &iter,
-                              "Type to add more text.\n"
-                              "Use Primary+Z to undo and Primary+Shift+Z to redo a previously undone 
action.\n"
-                              "\n",
-                              -1);
+          "The GtkTextView supports undo and redo through the use of a "
+          "GtkTextBuffer. You can enable or disable undo support using "
+          "gtk_text_buffer_set_enable_undo().\n"
+          "Type to add more text.\n"
+          "Use Control+z to undo and Control+Shift+z or Control+y to "
+          "redo previously undone operations.",
+          -1);
       gtk_text_buffer_end_irreversible_action (buffer);
 
       sw = gtk_scrolled_window_new ();