From 6ecc74f1b7606f66ae92a7421c4ed5d1db8a45af Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 29 Oct 2020 13:34:29 -0300 Subject: [PATCH] Use 'gnome' style as default on linux and classic in other OSs. --- src/objects/actions/view.c | 2 +- src/objects/window/window.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/objects/actions/view.c b/src/objects/actions/view.c index a0b6131..ac0b252 100644 --- a/src/objects/actions/view.c +++ b/src/objects/actions/view.c @@ -255,7 +255,7 @@ return (Pw3270ActionList *) list; } - Pw3270ActionList * pw3270_action_list_append(Pw3270ActionList *action_list, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag flags) { + Pw3270ActionList * pw3270_action_list_append(Pw3270ActionList *action_list, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag G_GNUC_UNUSED(flags)) { struct ListElement * element = (struct ListElement *) g_malloc0( diff --git a/src/objects/window/window.c b/src/objects/window/window.c index bc4a63d..6dca1f3 100644 --- a/src/objects/window/window.c +++ b/src/objects/window/window.c @@ -600,19 +600,26 @@ { g_autoptr(GSettings) settings = pw3270_application_window_settings_new(); +#ifdef DEBUG + PW3270_UI_STYLE style = PW3270_UI_STYLE_AUTOMATIC; +#else PW3270_UI_STYLE style = pw3270_application_get_ui_style(G_APPLICATION(application)); +#endif // DEBUG if(style == PW3270_UI_STYLE_AUTOMATIC) { - if(gtk_application_get_app_menu(application)) { - style = PW3270_UI_STYLE_GNOME; - } else { - style = PW3270_UI_STYLE_CLASSICAL; - g_settings_set_boolean(settings,"menubar-visible",TRUE); - g_settings_set_boolean(settings,"toolbar-visible",TRUE); - } +#ifdef G_OS_UNIX + style = PW3270_UI_STYLE_GNOME; + g_settings_set_boolean(settings,"menubar-visible",FALSE); +#else + style = PW3270_UI_STYLE_CLASSICAL; + g_settings_set_boolean(settings,"menubar-visible",TRUE); +#endif // G_OS_UNIX + + g_settings_set_boolean(settings,"toolbar-visible",TRUE); pw3270_application_set_ui_style(G_APPLICATION(application),style); + } if(style == PW3270_UI_STYLE_GNOME) { -- libgit2 0.21.2