summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-19 16:37:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-11-19 16:37:27 (GMT)
commit3520208cbd0ebf9f3db1a9711b49286462cd7e54 (patch)
tree7f6898aef9b9ff43330209299e85020308fb06dd
parenta1d0653fc8d8cc07aa130920b86e605e17beaa79 (diff)
parentce99f5ee69a6f8ebbf26d2a82df89b406becaf77 (diff)
downloadCMake-3520208cbd0ebf9f3db1a9711b49286462cd7e54.zip
CMake-3520208cbd0ebf9f3db1a9711b49286462cd7e54.tar.gz
CMake-3520208cbd0ebf9f3db1a9711b49286462cd7e54.tar.bz2
Merge topic 'ccmake_render_main_form_on_resize'
ce99f5ee69 ccmake: Fix rendering on window resize Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4061
-rw-r--r--Source/CursesDialog/cmCursesMainForm.cxx20
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index dff2afe..612b432 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -498,10 +498,6 @@ void cmCursesMainForm::UpdateProgress(const std::string& msg, float prog)
int cmCursesMainForm::Configure(int noconfigure)
{
- int xi;
- int yi;
- getmaxyx(stdscr, yi, xi);
-
this->ResetOutputs();
if (noconfigure == 0) {
@@ -559,11 +555,13 @@ int cmCursesMainForm::Configure(int noconfigure)
if (retVal == -2) {
return retVal;
}
- CurrentForm = this;
- this->Render(1, 1, xx, yy);
}
this->InitializeUI();
+ CurrentForm = this;
+ int xi;
+ int yi;
+ getmaxyx(stdscr, yi, xi);
this->Render(1, 1, xi, yi);
return 0;
@@ -571,10 +569,6 @@ int cmCursesMainForm::Configure(int noconfigure)
int cmCursesMainForm::Generate()
{
- int xi;
- int yi;
- getmaxyx(stdscr, yi, xi);
-
this->ResetOutputs();
this->UpdateProgress("Generating", 0);
@@ -614,11 +608,13 @@ int cmCursesMainForm::Generate()
if (retVal == -2) {
return retVal;
}
- CurrentForm = this;
- this->Render(1, 1, xx, yy);
}
this->InitializeUI();
+ CurrentForm = this;
+ int xi;
+ int yi;
+ getmaxyx(stdscr, yi, xi);
this->Render(1, 1, xi, yi);
return 0;