Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

feat(ui): ignore panel shortcut toggle and floating toggle fixes

Ahl760da4e709bcbe
diff --git a/toonz/sources/toonz/floatingpanelcommand.cpp b/toonz/sources/toonz/floatingpanelcommand.cpp
index caa348bb0..2e9c5a3bd 100644
--- a/toonz/sources/toonz/floatingpanelcommand.cpp
+++ b/toonz/sources/toonz/floatingpanelcommand.cpp
@@ -51,6 +51,8 @@ void OpenFloatingPanel::execute() {
if (Preferences::instance()->getBoolValue(togglePanelWithShortcut) &&
CommandManager::instance()->executeTriggeredByShortcut()) {
if (closeVisiblePanelsOfType(m_panelType)) return;
+ openFloatingPanelAfterShortcutToggle(m_panelType);
+ return;
}
getOrOpenFloatingPanel(m_panelType);
@@ -109,6 +111,16 @@ panel->raise();
*/
}
+static void showFloatingPanel(TPanel *panel, TMainWindow *currentRoom) {
+ // Alcuni pannelli devono essere resettati (Es.: il paletteViewerPanel)
+ panel->reset();
+ // Devo porre il pannello sotto il controllo del layout della stanza
+ currentRoom->addDockWidget(panel);
+ panel->setFloating(true);
+ panel->show();
+ panel->raise();
+}
+
bool OpenFloatingPanel::closeVisiblePanelsOfType(const std::string &panelType) {
TMainWindow *currentRoom = TApp::instance()->getCurrentRoom();
if (!currentRoom) return false;
@@ -116,15 +128,46 @@ bool OpenFloatingPanel::closeVisiblePanelsOfType(const std::string &panelType) {
bool closedAny = false;
const QList<TPanel *> panels = currentRoom->findChildren<TPanel *>();
for (TPanel *panel : panels) {
- if (panel->getPanelType() == panelType && panel->isFloating() &&
- !panel->isHidden()) {
- panel->close();
- closedAny = true;
- }
+ if (panel->getPanelType() != panelType || !panel->isFloating() ||
+ panel->isHidden() || panel->ignoresPanelShortcutToggle())
+ continue;
+ panel->dismissFloatingPanel();
+ closedAny = true;
}
return closedAny;
}
+TPanel *OpenFloatingPanel::openFloatingPanelAfterShortcutToggle(
+ const std::string &panelType) {
+ TMainWindow *currentRoom = TApp::instance()->getCurrentRoom();
+ if (!currentRoom) return nullptr;
+
+ QList<TPanel *> hiddenToDiscard;
+ TPanel *hiddenToRestore = nullptr;
+ const QList<TPanel *> panels = currentRoom->findChildren<TPanel *>();
+ for (TPanel *panel : panels) {
+ if (panel->getPanelType() != panelType || !panel->isFloating() ||
+ !panel->isHidden() || panel->ignoresPanelShortcutToggle())
+ continue;
+ if (!hiddenToRestore)
+ hiddenToRestore = panel;
+ else
+ hiddenToDiscard.append(panel);
+ }
+
+ for (TPanel *panel : hiddenToDiscard) {
+ if (panel->parentLayout()) panel->parentLayout()->removeWidget(panel);
+ panel->deleteLater();
+ }
+
+ if (hiddenToRestore) {
+ showFloatingPanel(hiddenToRestore, currentRoom);
+ return hiddenToRestore;
+ }
+
+ return getOrOpenFloatingPanel(panelType);
+}
+
TPanel *OpenFloatingPanel::getOrOpenFloatingPanel(
const std::string &panelType) {
TMainWindow *currentRoom = TApp::instance()->getCurrentRoom();
@@ -140,18 +183,15 @@ TPanel *OpenFloatingPanel::getOrOpenFloatingPanel(
// if there is already a floating panel and MultipleInstances are
// not allowed we must use it
if (!panel->areMultipleInstancesAllowed() && !panel->isHidden()) {
+ if (panel->ignoresPanelShortcutToggle()) continue;
if (panel->isFloating()) activateWidget(panel);
return panel;
}
// If there is a hidden panel we can show and use it
if (panel->isHidden()) {
- // Alcuni pannelli devono essere resettati (Es.: il paletteViewerPanel)
- panel->reset();
- // Devo porre il pannello sotto il controllo del layout della stanza
- currentRoom->addDockWidget(panel);
- panel->show();
- panel->raise();
+ if (panel->ignoresPanelShortcutToggle()) continue;
+ showFloatingPanel(panel, currentRoom);
return panel;
} else
lastFloatingPos = panel->pos();
diff --git a/toonz/sources/toonz/floatingpanelcommand.h b/toonz/sources/toonz/floatingpanelcommand.h
index 0fab32833..13cc586ed 100644
--- a/toonz/sources/toonz/floatingpanelcommand.h
+++ b/toonz/sources/toonz/floatingpanelcommand.h
@@ -21,6 +21,8 @@ public:
void execute() override;
static bool closeVisiblePanelsOfType(const std::string &panelType);
+ static TPanel *openFloatingPanelAfterShortcutToggle(
+ const std::string &panelType);
static TPanel *getOrOpenFloatingPanel(const std::string &panelType);
};
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 23f79a78e..77d77102d 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -310,6 +310,8 @@ void Room::save() {
// Room binding state persistence (custom panel feature)
settings.setValue("roomBound", pane->isRoomBound());
settings.setValue("boundRoomName", pane->getBoundRoomName());
+ settings.setValue("ignorePanelShortcutToggle",
+ pane->ignoresPanelShortcutToggle());
if (SaveLoadQSettings *persistent =
dynamic_cast<SaveLoadQSettings *>(pane->widget()))
persistent->save(settings);
@@ -394,6 +396,8 @@ void Room::load(const TFilePath &fp, RoomLoadParams &params) {
// Restore room binding state (custom panel feature)
pane->setRoomBound(m_settings->value("roomBound", false).toBool());
pane->setBoundRoomName(m_settings->value("boundRoomName", "").toString());
+ pane->setIgnorePanelShortcutToggle(
+ m_settings->value("ignorePanelShortcutToggle", false).toBool());
// Add panel to room
addDockWidget(pane);
diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp
index aeadd6af1..54bec43b3 100644
--- a/toonz/sources/toonz/pane.cpp
+++ b/toonz/sources/toonz/pane.cpp
@@ -13,6 +13,7 @@
// TnzLib includes
#include "toonz/preferences.h"
+#include "toonz/preferencesitemids.h"
#include "toonz/toonzfolders.h"
#include "toonz/tscenehandle.h"
@@ -54,7 +55,8 @@ TPanel::TPanel(QWidget *parent, Qt::WindowFlags flags,
, m_multipleInstancesAllowed(true)
, m_isRoomBound(false)
, m_boundRoomName("")
- , m_roomBindButton(nullptr) {
+ , m_roomBindButton(nullptr)
+ , m_ignorePanelShortcutToggle(false) {
m_panelTitleBar = new TPanelTitleBar(this, orientation);
setTitleBarWidget(m_panelTitleBar);
connect(m_panelTitleBar, &TPanelTitleBar::doubleClick, this,
@@ -63,6 +65,13 @@ TPanel::TPanel(QWidget *parent, Qt::WindowFlags flags,
&TPanel::onCloseButtonPressed);
setOrientation(orientation);
+ m_panelTitleBar->setContextMenuPolicy(Qt::CustomContextMenu);
+ connect(m_panelTitleBar, &QWidget::customContextMenuRequested, this,
+ [this](const QPoint &pos) {
+ onCustomContextMenuRequested(
+ mapFromGlobal(m_panelTitleBar->mapToGlobal(pos)));
+ });
+
// Enable context menu for room binding
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &QWidget::customContextMenuRequested, this,
@@ -119,9 +128,29 @@ void TPanel::onCloseButtonPressed() {
//-----------------------------------------------------------------------------
+void TPanel::dismissFloatingPanel() {
+ hide();
+ if (parentLayout()) parentLayout()->removeWidget(this);
+ emit closeButtonPressed();
+}
+
+//-----------------------------------------------------------------------------
+
void TPanel::onCustomContextMenuRequested(const QPoint &pos) {
QMenu menu(this);
+ if (isFloating() &&
+ Preferences::instance()->getBoolValue(togglePanelWithShortcut)) {
+ QAction *ignoreAction =
+ menu.addAction(tr("Ignore Panel Shortcut Toggle"));
+ ignoreAction->setCheckable(true);
+ ignoreAction->setChecked(m_ignorePanelShortcutToggle);
+ connect(ignoreAction, &QAction::triggered, [this](bool checked) {
+ setIgnorePanelShortcutToggle(checked);
+ });
+ menu.addSeparator();
+ }
+
// Add "Bind to Current Room" option
QAction *bindAction = menu.addAction(tr("Bind to Current Room"));
bindAction->setCheckable(true);
@@ -288,6 +317,12 @@ void TPanel::setRoomBound(bool bound) {
//-----------------------------------------------------------------------------
+void TPanel::setIgnorePanelShortcutToggle(bool ignore) {
+ m_ignorePanelShortcutToggle = ignore;
+}
+
+//-----------------------------------------------------------------------------
+
void TPanel::setBoundRoomName(const QString &roomName) {
m_boundRoomName = roomName;
}
diff --git a/toonz/sources/toonz/pane.h b/toonz/sources/toonz/pane.h
index 9ee695018..23da9680e 100644
--- a/toonz/sources/toonz/pane.h
+++ b/toonz/sources/toonz/pane.h
@@ -304,7 +304,14 @@ public:
void setRoomBindButton(TPanelTitleBarButton *button) noexcept {
m_roomBindButton = button;
}
-
+
+ bool ignoresPanelShortcutToggle() const noexcept {
+ return m_ignorePanelShortcutToggle;
+ }
+ void setIgnorePanelShortcutToggle(bool ignore);
+
+ void dismissFloatingPanel();
+
// Add room binding toggle button to the title bar
// This enables the "Bind to Room" feature for any panel
void addRoomBindButton();
@@ -359,6 +366,7 @@ private:
bool m_isRoomBound;
QString m_boundRoomName;
TPanelTitleBarButton *m_roomBindButton;
+ bool m_ignorePanelShortcutToggle;
};
//-----------------------------------------------------------------------------