Debugger: minor tweak.

Also ensure the custom image list controls are appropriately
shown/hidden when enabling the top-level stop on image load setting.
This commit is contained in:
Rene Gollent
2013-07-10 21:54:12 -04:00
parent 94dbabb056
commit 8b2fbc4fa0
@@ -430,14 +430,14 @@ void
BreakConditionConfigWindow::_UpdateStopImageState() BreakConditionConfigWindow::_UpdateStopImageState()
{ {
bool previousStop = fStopOnLoadEnabled; bool previousStop = fStopOnLoadEnabled;
bool previousCustomImages = fUseCustomImages; bool previousCustomImages = fUseCustomImages && fStopOnLoadEnabled;
fStopOnLoadEnabled = fTeam->StopOnImageLoad(); fStopOnLoadEnabled = fTeam->StopOnImageLoad();
fStopOnImageLoad->SetValue( fStopOnImageLoad->SetValue(
fStopOnLoadEnabled ? B_CONTROL_ON : B_CONTROL_OFF); fStopOnLoadEnabled ? B_CONTROL_ON : B_CONTROL_OFF);
fUseCustomImages = fTeam->StopImageNameListEnabled(); fUseCustomImages = fTeam->StopImageNameListEnabled();
fStopImageConstraints->Menu() fStopImageConstraints->Menu()
->ItemAt(fUseCustomImages ? 1 : 0)->SetMarked(true); ->ItemAt(fTeam->StopImageNameListEnabled() ? 1 : 0)->SetMarked(true);
fStopImageNames->MakeEmpty(); fStopImageNames->MakeEmpty();
const BStringList& imageNames = fTeam->StopImageNames(); const BStringList& imageNames = fTeam->StopImageNames();
@@ -462,8 +462,9 @@ BreakConditionConfigWindow::_UpdateStopImageButtons(bool previousStop,
bool previousCustomImages) bool previousCustomImages)
{ {
fStopImageConstraints->SetEnabled(fStopOnLoadEnabled); fStopImageConstraints->SetEnabled(fStopOnLoadEnabled);
if (!previousCustomImages && fUseCustomImages) bool showCustomGroup = fUseCustomImages && fStopOnLoadEnabled;
if (!previousCustomImages && showCustomGroup)
fCustomImageGroup->Show(); fCustomImageGroup->Show();
else if (previousCustomImages && !fUseCustomImages) else if (previousCustomImages && !showCustomGroup)
fCustomImageGroup->Hide(); fCustomImageGroup->Hide();
} }