[Xfce4-commits] [apps/xfce4-terminal] 01/01: Also hide scrollbar_visibility
noreply at xfce.org
noreply at xfce.org
Sat Nov 19 12:00:27 CET 2016
This is an automated email from the git hooks/post-receive script.
f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.
commit 8a739f654e00a3f23e7924bc4d1193b50e7349fb
Author: Igor <f2404 at yandex.ru>
Date: Sat Nov 19 13:00:22 2016 +0200
Also hide scrollbar_visibility
---
terminal/terminal-app.c | 2 +-
terminal/terminal-screen.c | 2 +-
terminal/terminal-window.c | 35 +++++++++++++++++++++++++++++++---
terminal/terminal-window.h | 47 ++++++++++++++++++++++++----------------------
4 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 8a8f939..49b5005 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -777,7 +777,7 @@ terminal_app_open_window (TerminalApp *app,
}
}
- TERMINAL_WINDOW (window)->scrollbar_visibility = attr->scrollbar;
+ terminal_window_set_scrollbar_visibility (TERMINAL_WINDOW (window), attr->scrollbar);
/* font and zoom for new window */
if (!reuse_window)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 82f6556..b577e92 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2276,7 +2276,7 @@ terminal_screen_update_scrolling_bar (TerminalScreen *screen)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
if (TERMINAL_IS_WINDOW (toplevel))
- visibility = TERMINAL_WINDOW (toplevel)->scrollbar_visibility;
+ visibility = terminal_window_get_scrollbar_visibility (TERMINAL_WINDOW (toplevel));
if (G_LIKELY (visibility == TERMINAL_VISIBILITY_DEFAULT))
{
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index f359fd2..bb1d10a 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -259,6 +259,8 @@ struct _TerminalWindowPrivate
GtkAction *action_fullscreen;
GQueue *closed_tabs_list;
+
+ TerminalVisibility scrollbar_visibility;
};
static guint window_signals[LAST_SIGNAL];
@@ -2257,7 +2259,7 @@ terminal_window_add (TerminalWindow *window,
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (window->notebook), GTK_WIDGET (screen), TRUE);
/* update scrollbar visibility */
- if (window->scrollbar_visibility != TERMINAL_VISIBILITY_DEFAULT)
+ if (window->priv->scrollbar_visibility != TERMINAL_VISIBILITY_DEFAULT)
terminal_screen_update_scrolling_bar (screen);
/* update screen font from window */
@@ -2462,8 +2464,9 @@ terminal_window_get_preferences_dialog (TerminalWindow *window)
/**
- * terminal_window_get_action_group:
- * @window : A #TerminalWindow.
+ * terminal_window_get_action:
+ * @window : A #TerminalWindow.
+ * @action_name : Name of action.
**/
GtkAction*
terminal_window_get_action (TerminalWindow *window,
@@ -2475,6 +2478,32 @@ terminal_window_get_action (TerminalWindow *window,
/**
+ * terminal_window_get_scrollbar_visibility:
+ * @window : A #TerminalWindow.
+ **/
+TerminalVisibility
+terminal_window_get_scrollbar_visibility (TerminalWindow *window)
+{
+ return window->priv->scrollbar_visibility;
+}
+
+
+
+/**
+ * terminal_window_set_scrollbar_visibility:
+ * @window : A #TerminalWindow.
+ * @scrollbar : Scrollbar visibility.
+ **/
+void
+terminal_window_set_scrollbar_visibility (TerminalWindow *window,
+ TerminalVisibility scrollbar)
+{
+ window->priv->scrollbar_visibility = scrollbar;
+}
+
+
+
+/**
* terminal_window_rebuild_tabs_menu:
* @window : A #TerminalWindow.
**/
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index cd11bf5..e1416cb 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -56,41 +56,44 @@ typedef struct
gchar *font;
TerminalZoomLevel zoom;
-
- TerminalVisibility scrollbar_visibility;
} TerminalWindow;
-GType terminal_window_get_type (void) G_GNUC_CONST;
+GType terminal_window_get_type (void) G_GNUC_CONST;
+
+GtkWidget *terminal_window_new (const gchar *role,
+ gboolean fullscreen,
+ TerminalVisibility menubar,
+ TerminalVisibility borders,
+ TerminalVisibility toolbar);
+
+void terminal_window_add (TerminalWindow *window,
+ TerminalScreen *screen);
-GtkWidget *terminal_window_new (const gchar *role,
- gboolean fullscreen,
- TerminalVisibility menubar,
- TerminalVisibility borders,
- TerminalVisibility toolbar);
+TerminalScreen *terminal_window_get_active (TerminalWindow *window);
-void terminal_window_add (TerminalWindow *window,
- TerminalScreen *screen);
+void terminal_window_notebook_show_tabs (TerminalWindow *window);
-TerminalScreen *terminal_window_get_active (TerminalWindow *window);
+GSList *terminal_window_get_restart_command (TerminalWindow *window);
-void terminal_window_notebook_show_tabs (TerminalWindow *window);
+void terminal_window_set_grid_size (TerminalWindow *window,
+ glong width,
+ glong height);
-GSList *terminal_window_get_restart_command (TerminalWindow *window);
+gboolean terminal_window_has_children (TerminalWindow *window);
-void terminal_window_set_grid_size (TerminalWindow *window,
- glong width,
- glong height);
+GObject *terminal_window_get_preferences (TerminalWindow *window);
-gboolean terminal_window_has_children (TerminalWindow *window);
+GtkWidget *terminal_window_get_preferences_dialog (TerminalWindow *window);
-GObject *terminal_window_get_preferences (TerminalWindow *window);
+GtkAction *terminal_window_get_action (TerminalWindow *window,
+ const gchar *action_name);
-GtkWidget *terminal_window_get_preferences_dialog (TerminalWindow *window);
+TerminalVisibility terminal_window_get_scrollbar_visibility (TerminalWindow *window);
-GtkAction *terminal_window_get_action (TerminalWindow *window,
- const gchar *action_name);
+void terminal_window_set_scrollbar_visibility (TerminalWindow *window,
+ TerminalVisibility scrollbar);
-void terminal_window_rebuild_tabs_menu (TerminalWindow *window);
+void terminal_window_rebuild_tabs_menu (TerminalWindow *window);
G_END_DECLS
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list