Magic-Mirror/x64dbg
1
0
Fork 0
mirror of https://github.com/x64dbg/x64dbg.git synced 2024-11-23 04:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3427 from foralost/#3397_Setting_comment_does_not_show

Browse Source 
Loading current graph in GUI_UPDATE_GRAPH_VIEW
This commit is contained in:
Duncan Ogilvie 2024-09-07 15:21:11 +02:00 committed by GitHub
commit 74c6d2a579
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/Src/Gui/DisassemblerGraphView.cpp
View File

@ -2004,10 +2004,10 @@ void DisassemblerGraphView::tokenizerConfigUpdatedSlot()
{ {
disasm.UpdateConfig(); disasm.UpdateConfig();
mPermanentHighlightingMode = ConfigBool("Disassembler", "PermanentHighlightingMode"); mPermanentHighlightingMode = ConfigBool("Disassembler", "PermanentHighlightingMode");
loadCurrentGraph(); loadCurrentGraphSlot();
} }
void DisassemblerGraphView::loadCurrentGraph() void DisassemblerGraphView::loadCurrentGraphSlot()
{ {
if(ConfigBool("Gui", "GraphZoomMode")) if(ConfigBool("Gui", "GraphZoomMode"))
{ {
@ -2151,7 +2151,7 @@ void DisassemblerGraphView::loadGraphSlot(BridgeCFGraphList* graphList, duint ad
currentBlockMap.clear(); currentBlockMap.clear();
this->cur_instr = addr ? addr : this->function; this->cur_instr = addr ? addr : this->function;
this->forceCenter = true; this->forceCenter = true;
loadCurrentGraph(); loadCurrentGraphSlot();
Bridge::getBridge()->setResult(BridgeResult::LoadGraph, 1); Bridge::getBridge()->setResult(BridgeResult::LoadGraph, 1);
} }
@ -2170,6 +2170,7 @@ void DisassemblerGraphView::updateGraphSlot()
zoomLevelOld = 1; zoomLevelOld = 1;
} }
loadCurrentGraphSlot();
this->viewport()->update(); this->viewport()->update();
} }
@ -2439,7 +2440,7 @@ void DisassemblerGraphView::colorsUpdatedSlot()
mInstructionHighlightBackgroundColor = ConfigColor("InstructionHighlightBackgroundColor"); mInstructionHighlightBackgroundColor = ConfigColor("InstructionHighlightBackgroundColor");
fontChanged(); fontChanged();
loadCurrentGraph(); loadCurrentGraphSlot();
} }
void DisassemblerGraphView::fontsUpdatedSlot() void DisassemblerGraphView::fontsUpdatedSlot()
@ -2461,7 +2462,7 @@ void DisassemblerGraphView::toggleOverviewSlot()
{ {
onlySummary = false; onlySummary = false;
mToggleSummary->setChecked(false); mToggleSummary->setChecked(false);
loadCurrentGraph(); loadCurrentGraphSlot();
} }
else else
this->viewport()->update(); this->viewport()->update();
@ -2471,7 +2472,7 @@ void DisassemblerGraphView::toggleSummarySlot()
{ {
drawOverview = false; drawOverview = false;
onlySummary = !onlySummary; onlySummary = !onlySummary;
loadCurrentGraph(); loadCurrentGraphSlot();
} }
void DisassemblerGraphView::selectionGetSlot(SELECTIONDATA* selection) void DisassemblerGraphView::selectionGetSlot(SELECTIONDATA* selection)

2
src/gui/Src/Gui/DisassemblerGraphView.h
View File

@ -272,7 +272,7 @@ public slots:
void toggleSummarySlot(); void toggleSummarySlot();
void selectionGetSlot(SELECTIONDATA* selection); void selectionGetSlot(SELECTIONDATA* selection);
void tokenizerConfigUpdatedSlot(); void tokenizerConfigUpdatedSlot();
void loadCurrentGraph(); void loadCurrentGraphSlot();
void disassembleAtSlot(duint va, duint cip); void disassembleAtSlot(duint va, duint cip);
void gotoExpressionSlot(); void gotoExpressionSlot();
void gotoOriginSlot(); void gotoOriginSlot();