[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/25] gtk: zap scrolled_window
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 01/25] gtk: zap scrolled_window |
Date: |
Wed, 21 May 2014 10:43:37 +0200 |
The vte widget implements the scrollable interface, placing it into
a scrolled window is pointless and creates a bunch of strange effects.
Zap it.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 9f5061a..f6f3677 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -110,7 +110,6 @@ typedef struct VirtualConsole
GtkWidget *menu_item;
GtkWidget *terminal;
#if defined(CONFIG_VTE)
- GtkWidget *scrolled_window;
CharDriverState *chr;
#endif
} VirtualConsole;
@@ -1189,8 +1188,6 @@ static GSList *gd_vc_init(GtkDisplayState *s,
VirtualConsole *vc, int index, GSL
const char *label;
char buffer[32];
char path[32];
- GtkWidget *scrolled_window;
- GtkAdjustment *vadjustment;
snprintf(buffer, sizeof(buffer), "vc%d", index);
snprintf(path, sizeof(path), "<QEMU>/View/VC%d", index);
@@ -1213,24 +1210,12 @@ static GSList *gd_vc_init(GtkDisplayState *s,
VirtualConsole *vc, int index, GSL
vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->terminal), -1);
-#if VTE_CHECK_VERSION(0, 28, 0) && GTK_CHECK_VERSION(3, 0, 0)
- vadjustment = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vc->terminal));
-#else
- vadjustment = vte_terminal_get_adjustment(VTE_TERMINAL(vc->terminal));
-#endif
-
- scrolled_window = gtk_scrolled_window_new(NULL, vadjustment);
- gtk_container_add(GTK_CONTAINER(scrolled_window), vc->terminal);
-
vte_terminal_set_size(VTE_TERMINAL(vc->terminal), 80, 25);
vc->chr->opaque = vc;
- vc->scrolled_window = scrolled_window;
-
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vc->scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), scrolled_window,
gtk_label_new(label));
+ gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), vc->terminal,
+ gtk_label_new(label));
g_signal_connect(vc->menu_item, "activate",
G_CALLBACK(gd_menu_switch_vc), s);
--
1.8.3.1
- [Qemu-devel] [PATCH 05/25] gtk: remove page numbering assumtions from the code, (continued)
- [Qemu-devel] [PATCH 05/25] gtk: remove page numbering assumtions from the code, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 06/25] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 09/25] gtk: use device type as label, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 21/25] gtk: Add handling for the xfree86 keycodes, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 08/25] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 12/25] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 11/25] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 14/25] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 13/25] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 15/25] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 01/25] gtk: zap scrolled_window,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 22/25] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 19/25] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 18/25] gtk: update all windows on mouse mode changes, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 17/25] gtk: fix grab checks, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 07/25] gtk: move vga state into VirtualGfxConsole, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 20/25] gtk: enable untabify for gfx, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 16/25] gtk: update gd_update_caption, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 23/25] gtk: window sizing overhaul, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 24/25] gtk: workaround gtk2 vte resize issue, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 25/25] gtk: factor out gtk3 grab into the new gd_grab_devices function, Gerd Hoffmann, 2014/05/21