This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 3520208cbd0ebf9f3db1a9711b49286462cd7e54 (commit)
via ce99f5ee69a6f8ebbf26d2a82df89b406becaf77 (commit)
from a1d0653fc8d8cc07aa130920b86e605e17beaa79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3520208cbd0ebf9f3db1a9711b49286462cd7e54
commit 3520208cbd0ebf9f3db1a9711b49286462cd7e54
Merge: a1d0653fc8 ce99f5ee69
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 19 16:37:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 19 11:37:27 2019 -0500
Merge topic 'ccmake_render_main_form_on_resize'
ce99f5ee69 ccmake: Fix rendering on window resize
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4061
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce99f5ee69a6f8ebbf26d2a82df89b406becaf77
commit ce99f5ee69a6f8ebbf26d2a82df89b406becaf77
Author: Sylvain Joubert <joubert...@gmail.com>
AuthorDate: Mon Nov 18 13:21:08 2019 +0100
Commit: Sylvain Joubert <joubert...@gmail.com>
CommitDate: Mon Nov 18 17:05:37 2019 +0100
ccmake: Fix rendering on window resize
Repro steps: configure (without errors), the logs are displayed then the
cache is displayed again, resize the window up -> the logs are
redisplayed after resize instead of the cache
The 'CurrentForm' pointer were left pointed to the last log message
form, this resets it to the main form when configure or generate is done
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx
b/Source/CursesDialog/cmCursesMainForm.cxx
index dff2afed61..612b432b3f 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;
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/cmCursesMainForm.cxx | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
