diff options
| -rw-r--r-- | gdb/testsuite/gdb.tui/new-layout.exp | 4 | ||||
| -rw-r--r-- | gdb/tui/tui-command.c | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-command.h | 2 | ||||
| -rw-r--r-- | gdb/tui/tui-win.c | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/gdb/testsuite/gdb.tui/new-layout.exp b/gdb/testsuite/gdb.tui/new-layout.exp index 883c760..e662b1f 100644 --- a/gdb/testsuite/gdb.tui/new-layout.exp +++ b/gdb/testsuite/gdb.tui/new-layout.exp @@ -76,6 +76,8 @@ set layouts \ "21.*return 0.*$hex <main>"] \ [list example4 "src 1 status 0 {-horizontal cmd 1 regs 1} 1" \ {{0 0 80 11} {40 12 40 12}} ""] \ + [list example5 "{-horizontal src 1 cmd 1} 1 status 0" \ + {{0 0 40 23}} ""] \ [list cmd_only "cmd 1" {} ""]] # Helper function to verify a list of boxes. @@ -136,7 +138,7 @@ foreach_with_prefix layout $layouts { Term::check_region_contents "info win output" \ 0 0 80 24 [multi_line "info win\\s+" \ "Name\\s+Lines\\s+Columns\\s+Focus\\s+" \ - "cmd\\s+20\\s+80\\s+\\(has focus\\)\\s+" \ + "cmd\\s+24\\s+80\\s+\\(has focus\\)\\s+" \ "$gdb_prompt\\s+"] } } diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c index fa8af970..0f6c395 100644 --- a/gdb/tui/tui-command.c +++ b/gdb/tui/tui-command.c @@ -31,12 +31,6 @@ /* See tui-command.h. */ -int -tui_cmd_window::max_height () const -{ - return tui_term_height () - 4; -} - void tui_cmd_window::resize (int height_, int width_, int origin_x, int origin_y) { diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h index 06cc24f..6c35436 100644 --- a/gdb/tui/tui-command.h +++ b/gdb/tui/tui-command.h @@ -31,8 +31,6 @@ struct tui_cmd_window : public tui_win_info DISABLE_COPY_AND_ASSIGN (tui_cmd_window); - int max_height () const override; - void refresh_window () override { } diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 2ec6180..31b6606 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -955,7 +955,7 @@ tui_set_win_width_command (const char *arg, int from_tty) int tui_win_info::max_height () const { - return tui_term_height () - 2; + return tui_term_height (); } /* See tui-data.h. */ @@ -963,7 +963,7 @@ tui_win_info::max_height () const int tui_win_info::max_width () const { - return tui_term_width () - 2; + return tui_term_width (); } static void |