diff options
| author | Tom Tromey <tom@tromey.com> | 2019-10-07 16:59:02 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-12-11 15:48:59 -0700 |
| commit | c8ec2f433c54dae7746db144a872da6f808e5d73 (patch) | |
| tree | 63652ad36846aaf282642c09bfa1f94d381a3094 | |
| parent | 4decd62b214e9cb3e66f5e90b28cfab9062c1464 (diff) | |
| download | binutils-c8ec2f433c54dae7746db144a872da6f808e5d73.zip binutils-c8ec2f433c54dae7746db144a872da6f808e5d73.tar.gz binutils-c8ec2f433c54dae7746db144a872da6f808e5d73.tar.bz2 | |
Move max_height method to tui_gen_win_info
This moves the max_height method to tui_gen_win_info and implements it
in the subclasses. This is used by a subsequent patch, which will
normalize window layout across all window types.
gdb/ChangeLog
2019-12-11 Tom Tromey <tom@tromey.com>
* tui/tui-stack.h (struct tui_locator_window) <max_height>: New
method.
* tui/tui-regs.h (struct tui_data_item_window) <max_height>: New
method.
* tui/tui-data.h (struct tui_gen_win_info) <max_height>: New
method.
(struct tui_win_info) <max_height>: Now override.
Change-Id: I4ba3e8899bc4668328d3d78e3c1674c61882450d
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/tui/tui-data.h | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-regs.h | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-stack.h | 5 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca47b8c..20d3321 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2019-12-11 Tom Tromey <tom@tromey.com> + + * tui/tui-stack.h (struct tui_locator_window) <max_height>: New + method. + * tui/tui-regs.h (struct tui_data_item_window) <max_height>: New + method. + * tui/tui-data.h (struct tui_gen_win_info) <max_height>: New + method. + (struct tui_win_info) <max_height>: Now override. + 2019-12-11 Joel Brobecker <brobecker@adacore.com> * NEWS: Create a new section for the next release branch. diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 282b49e..d3b84b1 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -82,6 +82,9 @@ public: return ""; } + /* Compute the maximum height of this window. */ + virtual int max_height () const = 0; + /* Resize this window. The parameters are used to set the window's size and position. */ virtual void resize (int height, int width, @@ -173,8 +176,7 @@ public: { } - /* Compute the maximum height of this window. */ - virtual int max_height () const; + int max_height () const override; /* Called after the tab width has been changed. */ virtual void update_tab_width () diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index e45a68f..d476bcf 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -41,6 +41,11 @@ struct tui_data_item_window : public tui_gen_win_info void refresh_window () override; + int max_height () const override + { + return 1; + } + const char *name = nullptr; /* The register number, or data display number. */ int item_no = -1; diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h index 93a79fb..dd9851b 100644 --- a/gdb/tui/tui-stack.h +++ b/gdb/tui/tui-stack.h @@ -37,6 +37,11 @@ struct tui_locator_window : public tui_gen_win_info proc_name[0] = 0; } + int max_height () const override + { + return 1; + } + void rerender () override; /* Update the locator, with the provided arguments. |