kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Fix #13927 (#22427)

Browse Source
This commit is contained in:
PaddleStroke
2025-07-17 04:55:52 +02:00
committed by GitHub
parent 70d1f02b42
commit 10a6a3fbe6
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Gui/ToolBarManager.cpp
View File

@@ -484,7 +484,12 @@ void ToolBarManager::setupConnection()
|| hParam == hStatusBar
|| hParam == hMenuBarRight
|| hParam == hMenuBarLeft) {
timer.start(100);
if (blockRestore) {
blockRestore = false;
}
else {
timer.start(100);
}
}
});
}
@@ -1269,8 +1274,14 @@ void ToolBarManager::setState(const QString& name, State state)
return hPref->GetBool(name.toStdString().c_str(), defaultvalue);
};
auto saveVisibility = [this, name](bool value) {
hPref->SetBool(name.toStdString().c_str(), value);
auto saveVisibility = [this, visibility, name](bool value,
ToolBarItem::DefaultVisibility policy) {
auto show = visibility(policy == ToolBarItem::DefaultVisibility::Visible);
if (show != value) {
blockRestore = true;
hPref->SetBool(name.toStdString().c_str(), value);
}
};
auto showhide = [visibility](QToolBar* toolbar, ToolBarItem::DefaultVisibility policy) {
@@ -1288,10 +1299,9 @@ void ToolBarManager::setState(const QString& name, State state)
QToolBar* tb = findToolBar(toolBars(), name);
if (tb) {
auto policy = getToolbarPolicy(tb);
if (state == State::RestoreDefault) {
auto policy = getToolbarPolicy(tb);
if(policy == ToolBarItem::DefaultVisibility::Unavailable) {
tb->hide();
tb->toggleViewAction()->setVisible(false);
@@ -1303,9 +1313,6 @@ void ToolBarManager::setState(const QString& name, State state)
}
}
else if (state == State::ForceAvailable) {
auto policy = getToolbarPolicy(tb);
tb->toggleViewAction()->setVisible(true);
// Unavailable policy defaults to a Visible toolbars when made available
@@ -1326,7 +1333,7 @@ void ToolBarManager::setState(const QString& name, State state)
}
else if (state == State::SaveState) {
auto show = tb->isVisible();
saveVisibility(show);
saveVisibility(show, policy);
}
}
}