[vte] widget: Show padding in size request debug output

[Christian Persch <chpe src gnome org>]

commit b7f5fe9fa297231a8370a6892753af50dfb0fc3a
Author: Christian Persch <chpe src gnome org>
Date:   Mon Sep 25 12:58:02 2017 +0200

    widget: Show padding in size request debug output

 src/app/app.cc |    7 ++++++-
 src/vte.cc     |   15 +++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/src/app/app.cc b/src/app/app.cc
index 35b2746..4b3fc95 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -908,6 +908,12 @@ vteapp_window_update_geometry(VteappWindow* window)
         window->cached_char_height = char_height;
         window->cached_chrome_width = chrome_width;
         window->cached_chrome_height = chrome_height;
+
+        verbose_print("Cached grid %dx%d char-size %dx%d chrome %dx%d csd %dx%d\n",
+                      columns, rows,
+                      window->cached_char_width, window->cached_char_height,
+                      window->cached_chrome_width, window->cached_chrome_height,
+                      window->cached_csd_width, window->cached_csd_height);
 }
 
 static void
@@ -966,7 +972,6 @@ vteapp_window_parse_geometry(VteappWindow* window)
                         vte_terminal_set_size(window->terminal,
                                               MAX(columns, MIN_COLUMNS),
                                               MAX(rows, MIN_ROWS));
-
                 }
         } else {
                 /* In GTK+ 3.0, the default size of a window comes from its minimum
diff --git a/src/vte.cc b/src/vte.cc
index 3846b59..e14ff4d 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -8173,11 +8173,12 @@ VteTerminalPrivate::widget_get_preferred_width(int *minimum_width,
                           m_padding.right;
 
        _vte_debug_print(VTE_DEBUG_WIDGET_SIZE,
-                       "[Terminal %p] minimum_width=%d, natural_width=%d for %ldx%ld cells.\n",
+                       "[Terminal %p] minimum_width=%d, natural_width=%d for %ldx%ld cells (padding 
%d,%d;%d,%d).\n",
                         m_terminal,
                        *minimum_width, *natural_width,
                        m_column_count,
-                       m_row_count);
+                         m_row_count,
+                         m_padding.left, m_padding.right, m_padding.top, m_padding.bottom);
 }
 
 void
@@ -8199,11 +8200,12 @@ VteTerminalPrivate::widget_get_preferred_height(int *minimum_height,
                           m_padding.bottom;
 
        _vte_debug_print(VTE_DEBUG_WIDGET_SIZE,
-                       "[Terminal %p] minimum_height=%d, natural_height=%d for %ldx%ld cells.\n",
+                       "[Terminal %p] minimum_height=%d, natural_height=%d for %ldx%ld cells (padding 
%d,%d;%d,%d).\n",
                         m_terminal,
                        *minimum_height, *natural_height,
                        m_column_count,
-                       m_row_count);
+                         m_row_count,
+                         m_padding.left, m_padding.right, m_padding.top, m_padding.bottom);
 }
 
 void
@@ -8223,10 +8225,11 @@ VteTerminalPrivate::widget_size_allocate(GtkAllocation *allocation)
        height = MAX(height, 1);
 
        _vte_debug_print(VTE_DEBUG_WIDGET_SIZE,
-                       "[Terminal %p] Sizing window to %dx%d (%ldx%ld).\n",
+                       "[Terminal %p] Sizing window to %dx%d (%ldx%ld, padding %d,%d;%d,%d).\n",
                         m_terminal,
                        allocation->width, allocation->height,
-                       width, height);
+                         width, height,
+                         m_padding.left, m_padding.right, m_padding.top, m_padding.bottom);
 
         auto current_allocation = get_allocated_rect();