yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tom de Vries 2023-11-13 21:22:50 +01:00
parent ff3c86a844
commit 5fa871f5d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/tui/tui-winsource.c
View File

@ -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);

4
gdb/tui/tui-winsource.h
View File

@ -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 ();