gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ebd9db89 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0c633866 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9f039a7d (commit)



commit ebd9db8921bfbb52e0299e18d4ec953b88072231
Merge: 9f039a7d0 0c633866f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue May 12 14:50:20 2020 +0200

    Merge branch 'maint'


commit 0c633866fdf00b545a4c23fbbc45b5276eb3c00f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue May 12 14:33:04 2020 +0200

    Bug 797717 - Summary bar changes height when opening a menu or scrolling over an option
    
    Apparently something changed in gtk which now calculates
    layout differently for a status bar for an empty string message.
    Setting a single space message doesn't trigger this different
    behaviour so we use that as workaround

diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index b2e8e7ab1..c8324a4a4 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -3454,7 +3454,7 @@ set_tip (GtkWidget *widget)
         g_object_get (data->action, "tooltip", &tooltip, NULL);
 
         gtk_statusbar_push (GTK_STATUSBAR (data->statusbar), 0,
-                            tooltip ? tooltip : "");
+                            tooltip ? tooltip : " ");
 
         g_free (tooltip);
     }
diff --git a/gnucash/gnome-utils/gnc-window.c b/gnucash/gnome-utils/gnc-window.c
index 2d4acf5d2..c0de5658b 100644
--- a/gnucash/gnome-utils/gnc-window.c
+++ b/gnucash/gnome-utils/gnc-window.c
@@ -115,7 +115,7 @@ gnc_window_update_status (GncWindow *window, GncPluginPage *page)
     statusbar = gnc_window_get_statusbar (window);
     message = gnc_plugin_page_get_statusbar_text(page);
     gtk_statusbar_pop(GTK_STATUSBAR(statusbar), 0);
-    gtk_statusbar_push(GTK_STATUSBAR(statusbar), 0, message ? message : "");
+    gtk_statusbar_push(GTK_STATUSBAR(statusbar), 0, message ? message : " ");
 }
 
 void



Summary of changes:
 gnucash/gnome-utils/gnc-main-window.c | 2 +-
 gnucash/gnome-utils/gnc-window.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)