[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] ui: gtk: Fix a runtime warning on vte >= 0.37
From: |
Cole Robinson |
Subject: |
[Qemu-devel] [PATCH 09/10] ui: gtk: Fix a runtime warning on vte >= 0.37 |
Date: |
Fri, 6 May 2016 14:03:13 -0400 |
inner-border was dropped in vte API 2.91, in favor of the standard
padding style
Signed-off-by: Cole Robinson <address@hidden>
---
ui/gtk.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ui/gtk.c b/ui/gtk.c
index 9876d89..d156c8a 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -329,6 +329,7 @@ static void gd_update_geometry_hints(VirtualConsole *vc)
} else if (vc->type == GD_VC_VTE) {
VteTerminal *term = VTE_TERMINAL(vc->vte.terminal);
GtkBorder *ib;
+ GtkBorder padding;
geo.width_inc = vte_terminal_get_char_width(term);
geo.height_inc = vte_terminal_get_char_height(term);
@@ -339,7 +340,17 @@ static void gd_update_geometry_hints(VirtualConsole *vc)
geo.min_width = geo.width_inc * VC_TERM_X_MIN;
geo.min_height = geo.height_inc * VC_TERM_Y_MIN;
mask |= GDK_HINT_MIN_SIZE;
+
+#if VTE_CHECK_VERSION(0, 37, 0)
+ gtk_style_context_get_padding(
+ gtk_widget_get_style_context(vc->vte.terminal),
+ gtk_widget_get_state_flags(vc->vte.terminal),
+ &padding);
+ ib = &padding;
+#else
gtk_widget_style_get(vc->vte.terminal, "inner-border", &ib, NULL);
+#endif
+
if (ib) {
geo.base_width += ib->left + ib->right;
geo.base_height += ib->top + ib->bottom;
--
2.7.4
- [Qemu-devel] [PATCH 00/10] ui: gtk and sdl2 fixes, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 01/10] ui: gtk: fix crash when terminal inner-border is NULL, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 05/10] configure: add echo_version helper, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 02/10] ui: sdl2: Release grab before opening console window, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 07/10] configure: report SDL version, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 06/10] configure: report GTK version, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 10/10] ui: gtk: Fix some deprecation warnings, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 03/10] configure: build SDL if only SDL2 available, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 08/10] configure: support vte-2.91, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 04/10] configure: error on unknown --with-sdlabi value, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 09/10] ui: gtk: Fix a runtime warning on vte >= 0.37,
Cole Robinson <=