[Xfce4-commits] [apps/xfce4-terminal] 01/01: Make drop_down field private
noreply at xfce.org
noreply at xfce.org
Sun May 6 22:15:01 CEST 2018
This is an automated email from the git hooks/post-receive script.
f 2 4 0 4 p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-terminal.
commit 5a8581ff9cf2b300c3be5278652d7051517a88da
Author: Igor <f2404 at yandex.ru>
Date: Sun May 6 16:14:54 2018 -0400
Make drop_down field private
---
terminal/terminal-screen.c | 2 +-
terminal/terminal-window-dropdown.c | 30 +++++++++++------------
terminal/terminal-window.c | 48 ++++++++++++++++++++++++++++++-------
terminal/terminal-window.h | 10 ++++----
4 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 63e868d..e28171a 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2700,7 +2700,7 @@ terminal_screen_update_font (TerminalScreen *screen)
#endif
/* update window geometry it required (not needed for drop-down) */
- if (TERMINAL_IS_WINDOW (toplevel) && !TERMINAL_WINDOW (toplevel)->drop_down && grid_w > 0 && grid_h > 0)
+ if (TERMINAL_IS_WINDOW (toplevel) && !terminal_window_is_drop_down (TERMINAL_WINDOW (toplevel)) && grid_w > 0 && grid_h > 0)
terminal_screen_force_resize_window (screen, GTK_WINDOW (toplevel), grid_w, grid_h);
}
diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
index c9912bc..f60e1a8 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -114,33 +114,33 @@ typedef enum
struct _TerminalWindowDropdown
{
- TerminalWindow parent_instance;
+ TerminalWindow parent_instance;
/* timeout for animation */
- guint animation_timeout_id;
- guint animation_time;
- TerminalDirection animation_dir;
+ guint animation_timeout_id;
+ guint animation_time;
+ TerminalDirection animation_dir;
/* ui widgets */
- GtkWidget *keep_open;
+ GtkWidget *keep_open;
/* idle for detecting focus out during grabs (Alt+Tab) */
- guint grab_timeout_id;
+ guint grab_timeout_id;
/* measurements */
- gdouble rel_width;
- gdouble rel_height;
- gdouble rel_position;
- gdouble rel_position_vertical;
+ gdouble rel_width;
+ gdouble rel_height;
+ gdouble rel_position;
+ gdouble rel_position_vertical;
- GtkStatusIcon *status_icon;
+ GtkStatusIcon *status_icon;
/* last screen and monitor */
- GdkScreen *screen;
- gint monitor_num;
+ GdkScreen *screen;
+ gint monitor_num;
/* server time of focus out with grab */
- gint64 focus_out_time;
+ gint64 focus_out_time;
};
@@ -252,7 +252,7 @@ terminal_window_dropdown_init (TerminalWindowDropdown *dropdown)
dropdown->animation_dir = ANIMATION_DIR_NONE;
/* shared setting to disable some functionality in TerminalWindow */
- window->drop_down = TRUE;
+ terminal_window_set_drop_down (window, TRUE);
/* default window settings */
gtk_window_set_decorated (GTK_WINDOW (dropdown), FALSE);
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 7679d8b..1a484cc 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -309,6 +309,9 @@ struct _TerminalWindowPrivate
TerminalVisibility scrollbar_visibility;
TerminalZoomLevel zoom;
+
+ /* if this is a TerminalWindowDropdown */
+ guint drop_down : 1;
};
static guint window_signals[LAST_SIGNAL];
@@ -929,7 +932,7 @@ terminal_window_set_size_force_grid (TerminalWindow *window,
/* required to get the char height/width right */
if (gtk_widget_get_realized (GTK_WIDGET (screen))
- && !window->drop_down)
+ && !window->priv->drop_down)
{
terminal_screen_force_resize_window (screen, GTK_WINDOW (window),
force_grid_width, force_grid_height);
@@ -1157,7 +1160,7 @@ terminal_window_notebook_page_added (GtkNotebook *notebook,
/* show the tabs when needed */
terminal_window_notebook_show_tabs (window);
}
- else if (G_UNLIKELY (window->drop_down))
+ else if (G_UNLIKELY (window->priv->drop_down))
{
/* try to calculate a decent grid size based on the info we have now */
terminal_window_dropdown_get_size (TERMINAL_WINDOW_DROPDOWN (window), screen, &w, &h);
@@ -1761,7 +1764,7 @@ copy_input_popover_close (GtkWidget *popover,
TerminalWindow *window)
{
/* need for hiding on focus */
- if (window->drop_down)
+ if (window->priv->drop_down)
terminal_util_activate_window (GTK_WINDOW (window));
/* close the dialog */
@@ -1837,7 +1840,7 @@ terminal_window_action_prefs_died (gpointer user_data,
window->priv->preferences_dialog = NULL;
window->priv->n_child_windows--;
- if (window->drop_down)
+ if (window->priv->drop_down)
terminal_util_activate_window (GTK_WINDOW (window));
}
@@ -1849,7 +1852,7 @@ terminal_window_action_prefs (GtkAction *action,
{
if (window->priv->preferences_dialog == NULL)
{
- window->priv->preferences_dialog = terminal_preferences_dialog_new (window->drop_down, window->drop_down);
+ window->priv->preferences_dialog = terminal_preferences_dialog_new (window->priv->drop_down, window->priv->drop_down);
if (G_LIKELY (window->priv->preferences_dialog != NULL))
{
window->priv->n_child_windows++;
@@ -1937,7 +1940,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_window_unfullscreen (GTK_WINDOW (window));
/* update drop-down window geometry, otherwise it'll be incorrect */
- if (window->drop_down)
+ if (window->priv->drop_down)
terminal_window_dropdown_update_geometry (TERMINAL_WINDOW_DROPDOWN (window));
}
}
@@ -2098,7 +2101,7 @@ title_popover_close (GtkWidget *popover,
terminal_return_if_fail (window->priv->title_popover != NULL);
/* need for hiding on focus */
- if (window->drop_down)
+ if (window->priv->drop_down)
terminal_util_activate_window (GTK_WINDOW (window));
/* close the dialog */
@@ -2239,7 +2242,7 @@ terminal_window_action_search_response (GtkWidget *dialog,
else
{
/* need for hiding on focus */
- if (window->drop_down)
+ if (window->priv->drop_down)
terminal_util_activate_window (GTK_WINDOW (window));
/* hide dialog */
@@ -2672,7 +2675,7 @@ terminal_window_notebook_show_tabs (TerminalWindow *window)
if (npages < 2)
{
g_object_get (G_OBJECT (window->priv->preferences),
- window->drop_down ? "dropdown-always-show-tabs" :
+ window->priv->drop_down ? "dropdown-always-show-tabs" :
"misc-always-show-tabs", &show_tabs, NULL);
}
@@ -2937,6 +2940,7 @@ terminal_window_get_zoom_level (TerminalWindow *window)
/**
* terminal_window_set_zoom_level:
* @window : A #TerminalWindow.
+ * @zoom : Zoom level.
**/
void
terminal_window_set_zoom_level (TerminalWindow *window,
@@ -2948,6 +2952,32 @@ terminal_window_set_zoom_level (TerminalWindow *window,
/**
+ * terminal_window_is_drop_down:
+ * @window : A #TerminalWindow.
+ **/
+gboolean
+terminal_window_is_drop_down (TerminalWindow *window)
+{
+ return window->priv->drop_down != 0;
+}
+
+
+
+/**
+ * terminal_window_set_drop_down:
+ * @window : A #TerminalWindow.
+ * @drop_down : Whether the window is drop-down.
+ **/
+void
+terminal_window_set_drop_down (TerminalWindow *window,
+ gboolean drop_down)
+{
+ window->priv->drop_down = drop_down;
+}
+
+
+
+/**
* terminal_window_get_menubar_height:
* @window : A #TerminalWindow.
**/
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index ced5f61..9bd8389 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -45,9 +45,6 @@ typedef struct
GtkWindow parent_instance;
TerminalWindowPrivate *priv;
-
- /* if this is a TerminalWindowDropdown */
- guint drop_down : 1;
} TerminalWindow;
GType terminal_window_get_type (void) G_GNUC_CONST;
@@ -85,20 +82,21 @@ GtkAction *terminal_window_get_action (TerminalWindow
const gchar *action_name);
const gchar *terminal_window_get_font (TerminalWindow *window);
-
void terminal_window_set_font (TerminalWindow *window,
const gchar *font);
TerminalVisibility terminal_window_get_scrollbar_visibility (TerminalWindow *window);
-
void terminal_window_set_scrollbar_visibility (TerminalWindow *window,
TerminalVisibility scrollbar);
TerminalZoomLevel terminal_window_get_zoom_level (TerminalWindow *window);
-
void terminal_window_set_zoom_level (TerminalWindow *window,
TerminalZoomLevel zoom);
+gboolean terminal_window_is_drop_down (TerminalWindow *window);
+void terminal_window_set_drop_down (TerminalWindow *window,
+ gboolean drop_down);
+
gint terminal_window_get_menubar_height (TerminalWindow *window);
gint terminal_window_get_toolbar_height (TerminalWindow *window);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list