empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed minor layout issues with "go to all" window

Browse source
This commit is contained in:
Sour 2019-01-27 14:59:36 -05:00
parent d076871ea2
commit 1088eb6656
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
GUI.NET/Debugger/frmGoToAll.cs
View file

@ -160,8 +160,8 @@ namespace Mesen.GUI.Debugger
byte[] cdlData = InteropEmu.DebugGetPrgCdlData(); byte[] cdlData = InteropEmu.DebugGetPrgCdlData();
List<SearchResultInfo> searchResults = new List<SearchResultInfo>(); List<SearchResultInfo> searchResults = new List<SearchResultInfo>();
bool isEmptySearch = string.IsNullOrWhiteSpace(searchString);
if(!string.IsNullOrWhiteSpace(searchString)) { if(!isEmptySearch) {
if(_symbolProvider != null) { if(_symbolProvider != null) {
if(_showFilesAndConstants) { if(_showFilesAndConstants) {
foreach(Ld65DbgImporter.FileInfo file in _symbolProvider.Files.Values) { foreach(Ld65DbgImporter.FileInfo file in _symbolProvider.Files.Values) {
@ -269,14 +269,15 @@ namespace Mesen.GUI.Debugger
_resultCount = Math.Min(searchResults.Count, MaxResultCount); _resultCount = Math.Min(searchResults.Count, MaxResultCount);
SelectedResult = 0; SelectedResult = 0;
if(searchResults.Count == 0) { if(searchResults.Count == 0 && !isEmptySearch) {
searchResults.Add(new SearchResultInfo() { Caption = "No results found.", AbsoluteAddress = -1 }); searchResults.Add(new SearchResultInfo() { Caption = "No results found.", AbsoluteAddress = -1 });
pnlResults.BackColor = SystemColors.ControlLight; pnlResults.BackColor = SystemColors.ControlLight;
} else { } else {
pnlResults.BackColor = SystemColors.ControlDarkDark; pnlResults.BackColor = SystemColors.ControlDarkDark;
} }
lblResultCount.Text = searchResults.Count.ToString() + " results"; lblResultCount.Visible = !isEmptySearch;
lblResultCount.Text = _resultCount.ToString() + (_resultCount == 1 ? " result" : " results");
if(searchResults.Count > MaxResultCount) { if(searchResults.Count > MaxResultCount) {
lblResultCount.Text += " (" + MaxResultCount.ToString() + " shown)"; lblResultCount.Text += " (" + MaxResultCount.ToString() + " shown)";
} }
@ -288,7 +289,7 @@ namespace Mesen.GUI.Debugger
tlpResults.SuspendLayout(); tlpResults.SuspendLayout();
} }
for(int i = 0; i < _resultCount; i++) { for(int i = 0; i < searchResults.Count; i++) {
_results[i].Initialize(searchResults[i]); _results[i].Initialize(searchResults[i]);
_results[i].Tag = searchResults[i]; _results[i].Tag = searchResults[i];
_results[i].Visible = true; _results[i].Visible = true;
@ -299,7 +300,7 @@ namespace Mesen.GUI.Debugger
} }
pnlResults.VerticalScroll.Value = 0; pnlResults.VerticalScroll.Value = 0;
tlpResults.Height = (_results[0].Height + 1) * _resultCount; tlpResults.Height = (_results[0].Height + 1) * searchResults.Count;
pnlResults.ResumeLayout(); pnlResults.ResumeLayout();
if(Program.IsMono) { if(Program.IsMono) {