aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-06-27 12:30:18 +0200
committerGerd Hoffmann <kraxel@redhat.com>2016-06-27 12:30:18 +0200
commit1222b4a240cdcb686e95671f93edc1187f345f64 (patch)
tree321788bc1a419a817aba33da88971b933153cd82
parent5c04870d60159bafe4931ce8a140840dd0a7429b (diff)
downloadvconsole-1222b4a240cdcb686e95671f93edc1187f345f64.tar.gz
fix vte padding
-rw-r--r--domain.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/domain.c b/domain.c
index 8679271..7b70ff1 100644
--- a/domain.c
+++ b/domain.c
@@ -366,7 +366,7 @@ static void domain_vte_geometry_hints(struct vconsole_domain *dom, GtkWindow *wi
{
GdkWindowHints mask = 0;
GdkGeometry geo = {};
- GtkBorder *ib;
+ GtkBorder padding = { 0 };
geo.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(dom->vte));
geo.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(dom->vte));
@@ -377,11 +377,16 @@ static void domain_vte_geometry_hints(struct vconsole_domain *dom, GtkWindow *wi
geo.min_width = geo.width_inc * 80;
geo.min_height = geo.height_inc * 25;
mask |= GDK_HINT_MIN_SIZE;
- gtk_widget_style_get(dom->vte, "inner-border", &ib, NULL);
- geo.base_width += ib->left + ib->right;
- geo.base_height += ib->top + ib->bottom;
- geo.min_width += ib->left + ib->right;
- geo.min_height += ib->top + ib->bottom;
+
+ gtk_style_context_get_padding(
+ gtk_widget_get_style_context(dom->vte),
+ gtk_widget_get_state_flags(dom->vte),
+ &padding);
+
+ geo.base_width += padding.left + padding.right;
+ geo.base_height += padding.top + padding.bottom;
+ geo.min_width += padding.left + padding.right;
+ geo.min_height += padding.top + padding.bottom;
gtk_window_set_geometry_hints(win, dom->vte, &geo, mask);
}