[vte/wip/issue-335: 3/3] app: Add option to use a GtkScrolledWindow
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/wip/issue-335: 3/3] app: Add option to use a GtkScrolledWindow
- Date: Wed, 3 Mar 2021 17:56:13 +0000 (UTC)
commit 436ef404928f4e49246292a4a2129fcb67b7db8f
Author: Christian Persch <chpe src gnome org>
Date: Wed Mar 3 18:56:08 2021 +0100
app: Add option to use a GtkScrolledWindow
... for testing purposes.
Note that geometry and sizing don't work when using a GtkScrolledWindow.
src/app/app.cc | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/src/app/app.cc b/src/app/app.cc
index bee48a1a..52bdb673 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -84,6 +84,7 @@ public:
gboolean scroll_unit_pixels{false};
gboolean test_mode{false};
gboolean track_clipboard_targets{false};
+ gboolean use_scrolled_window{false};
gboolean use_theme_colors{false};
gboolean version{false};
gboolean whole_window_transparent{false};
@@ -664,6 +665,8 @@ public:
{ "test-mode", 0, 0, G_OPTION_ARG_NONE, &test_mode,
"Enable test mode", nullptr },
#endif
+ { "use-scrolled-window", 0, 0, G_OPTION_ARG_NONE, &use_scrolled_window,
+ "Use a GtkScrolledWindow", nullptr },
{ "use-theme-colors", 0, 0, G_OPTION_ARG_NONE, &use_theme_colors,
"Use foreground and background colors from the gtk+ theme", nullptr },
@@ -721,6 +724,11 @@ public:
swap(fg_color, bg_color);
}
+ if (use_scrolled_window) {
+ no_geometry_hints = true;
+ no_scrollbar = true;
+ }
+
#if VTE_GTK == 4
if (rv && !gtk_init_check()) {
g_set_error_literal(error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
@@ -1445,6 +1453,9 @@ vteapp_window_add_dingus(VteappWindow* window,
static void
vteapp_window_update_geometry(VteappWindow* window)
{
+ if (options.no_geometry_hints)
+ return;
+
#if VTE_GTK == 3
GtkWidget* window_widget = GTK_WIDGET(window);
GtkWidget* terminal_widget = GTK_WIDGET(window->terminal);
@@ -1537,6 +1548,10 @@ vteapp_window_update_geometry(VteappWindow* window)
static void
vteapp_window_resize(VteappWindow* window)
{
+ /* Can't do this when not using geometry hints */
+ if (options.no_geometry_hints)
+ return;
+
/* Don't do this for fullscreened, maximised, or tiled windows. */
#if VTE_GTK == 3
if (window->window_state & (GDK_WINDOW_STATE_MAXIMIZED |
@@ -2395,12 +2410,14 @@ vteapp_window_constructed(GObject *object)
gtk_widget_set_margin_bottom(GTK_WIDGET(window->terminal), margin);
}
- auto vadj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(window->terminal));
+ if (!options.no_scrollbar) {
+ auto vadj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(window->terminal));
#if VTE_GTK == 3
- gtk_range_set_adjustment(GTK_RANGE(window->scrollbar), vadj);
+ gtk_range_set_adjustment(GTK_RANGE(window->scrollbar), vadj);
#elif VTE_GTK == 4
- gtk_scrollbar_set_adjustment(GTK_SCROLLBAR(window->scrollbar), vadj);
+ gtk_scrollbar_set_adjustment(GTK_SCROLLBAR(window->scrollbar), vadj);
#endif
+ }
if (options.no_scrollbar) {
#if VTE_GTK == 3
@@ -2563,8 +2580,23 @@ vteapp_window_constructed(GObject *object)
vteapp_window_add_dingus(window, options.dingus);
/* Done! */
- gtk_grid_attach(GTK_GRID(window->window_grid), GTK_WIDGET(window->terminal),
- 0, 0, 1, 1);
+ if (options.use_scrolled_window) {
+#if VTE_GTK == 3
+ auto sw = gtk_scrolled_window_new(nullptr, nullptr);
+#elif VTE_GTK == 4
+ auto sw = gtk_scrolled_window_new();
+#endif /* VTE_GTK */
+ gtk_container_add(GTK_CONTAINER(sw), GTK_WIDGET(window->terminal));
+ gtk_grid_attach(GTK_GRID(window->window_grid), sw,
+ 0, 0, 1, 1);
+ gtk_widget_set_halign(GTK_WIDGET(sw), GTK_ALIGN_FILL);
+ gtk_widget_set_valign(GTK_WIDGET(sw), GTK_ALIGN_FILL);
+ gtk_widget_show(sw);
+ } else {
+ gtk_grid_attach(GTK_GRID(window->window_grid), GTK_WIDGET(window->terminal),
+ 0, 0, 1, 1);
+ }
+
gtk_widget_set_halign(GTK_WIDGET(window->terminal), GTK_ALIGN_FILL);
gtk_widget_set_valign(GTK_WIDGET(window->terminal), GTK_ALIGN_FILL);
gtk_widget_show(GTK_WIDGET(window->terminal));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]