[haiku-commits] haiku: hrev45844 - src/apps/debugger/user_interface/gui/team_window
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 11 Jul 2013 03:55:12 +0200 (CEST)
hrev45844 adds 1 changeset to branch 'master'
old head: 94dbabb056d9ee474c70266aaacf9786a3bb2ad6
new head: 8b2fbc4fa0b6295ed6ebb2484018e42dc12d1cd0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8b2fbc4+%5E94dbabb
----------------------------------------------------------------------------
8b2fbc4: Debugger: minor tweak.
Also ensure the custom image list controls are appropriately
shown/hidden when enabling the top-level stop on image load setting.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45844
Commit: 8b2fbc4fa0b6295ed6ebb2484018e42dc12d1cd0
URL: http://cgit.haiku-os.org/haiku/commit/?id=8b2fbc4
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Thu Jul 11 01:54:12 2013 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 4 deletions(-)
.../gui/team_window/BreakConditionConfigWindow.cpp | 9 +++++----
----------------------------------------------------------------------------
diff --git
a/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp
b/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp
index 3e6f659..e1379aa 100644
---
a/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp
+++
b/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp
@@ -430,14 +430,14 @@ void
BreakConditionConfigWindow::_UpdateStopImageState()
{
bool previousStop = fStopOnLoadEnabled;
- bool previousCustomImages = fUseCustomImages;
+ bool previousCustomImages = fUseCustomImages && fStopOnLoadEnabled;
fStopOnLoadEnabled = fTeam->StopOnImageLoad();
fStopOnImageLoad->SetValue(
fStopOnLoadEnabled ? B_CONTROL_ON : B_CONTROL_OFF);
fUseCustomImages = fTeam->StopImageNameListEnabled();
fStopImageConstraints->Menu()
- ->ItemAt(fUseCustomImages ? 1 : 0)->SetMarked(true);
+ ->ItemAt(fTeam->StopImageNameListEnabled() ? 1 :
0)->SetMarked(true);
fStopImageNames->MakeEmpty();
const BStringList& imageNames = fTeam->StopImageNames();
@@ -462,8 +462,9 @@ BreakConditionConfigWindow::_UpdateStopImageButtons(bool
previousStop,
bool previousCustomImages)
{
fStopImageConstraints->SetEnabled(fStopOnLoadEnabled);
- if (!previousCustomImages && fUseCustomImages)
+ bool showCustomGroup = fUseCustomImages && fStopOnLoadEnabled;
+ if (!previousCustomImages && showCustomGroup)
fCustomImageGroup->Show();
- else if (previousCustomImages && !fUseCustomImages)
+ else if (previousCustomImages && !showCustomGroup)
fCustomImageGroup->Hide();
}
Other related posts:
- » [haiku-commits] haiku: hrev45844 - src/apps/debugger/user_interface/gui/team_window - anevilyak
