[binutils-gdb] [gdb/tui] Don't include border_width in left_margin

[binutils-gdb] [gdb/tui] Don't include border_width in left_margin

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5fa871f5d93bf285753f219cf583d0763dc0cd33

commit 5fa871f5d93bf285753f219cf583d0763dc0cd33
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Nov 13 21:22:50 2023 +0100

    [gdb/tui] Don't include border_width in left_margin
    
    Currently left_margin does not match its documentation:
    ...
      /* Return the size of the left margin space, this is the space used to
         display things like breakpoint markers.  */
      int left_margin () const
      { return box_width () + TUI_EXECINFO_SIZE + extra_margin (); }
    ...
    
    It is stated that the left margin is reserved to display things, but
    the box_width is not used for that.
    
    Fix this by dropping box_width () from the left_margin calculation.
    
    Tested on x86_64-linux.
    
    Approved-By: Tom Tromey <tom@tromey.com>

Diff:
---
 gdb/tui/tui-winsource.c | 2 +-
 gdb/tui/tui-winsource.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 83ce48090a0..ea4ca219292 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -348,7 +348,7 @@ tui_source_window_base::refresh_window ()
   gdb_assert (pad_x + view_width <= pad_width || m_pad.get () == nullptr);
 
   int sminrow = y + box_width ();
-  int smincol = x + left_margin;
+  int smincol = x + box_width () + left_margin;
   int smaxrow = sminrow + m_content.size () - 1;
   int smaxcol = smincol + view_width - 1;
   prefresh (m_pad.get (), 0, pad_x, sminrow, smincol, smaxrow, smaxcol);
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index dccce0efca1..c2826165a10 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -206,13 +206,13 @@ private:
   /* Return the size of the left margin space, this is the space used to
      display things like breakpoint markers.  */
   int left_margin () const
-  { return box_width () + TUI_EXECINFO_SIZE + extra_margin (); }
+  { return TUI_EXECINFO_SIZE + extra_margin (); }
 
   /* Return the width of the area that is available for window content.
      This is the window width minus the borders and the left margin, which
      is used for displaying things like breakpoint markers.  */
   int view_width () const
-  { return width - left_margin () - box_width (); }
+  { return width - left_margin () - box_size (); }
 
   void show_source_content ();