oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into plugin

Browse Source 
# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	ext/core
This commit is contained in:
Mike Solar
2025-12-13 21:45:46 +08:00
parent 9ae018341c 6dec37eef4
commit 22fd521951
20 changed files with 203 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/window/mainwindow/mainwindow.cpp
+6 -4
View File
@@ -27,15 +27,17 @@
#include <QOffscreenSurface>
#endif
#include "KDDockWidgets/src/qtwidgets/Window_p.h"
#include "dialog/about/about.h"
#include "mainmenu.h"
#include "mainstatusbar.h"
#include "KDDockWidgets/src/LayoutSaver.h"
#include "timeline/timelineundoworkarea.h"
namespace olive
{
#define super KDDockWidgets::MainWindow
#define super KDDockWidgets::QtWidgets::MainWindow
MainWindow::MainWindow(QWidget *parent)
: super(QStringLiteral("OliveMain"), KDDockWidgets::MainWindowOption_None,
@@ -93,7 +95,7 @@ MainWindow::MainWindow(QWidget *parent)
// emit the "shown" signal before emitting the "hidden" signals, resulting
// in Core thinking there are -1 pixel samplers open. To mitigate that,
// we force "shown" to emit ourselves here.
emit pixel_sampler_panel_->shown();
emit pixel_sampler_panel_->shown(Qt::OtherFocusReason);
// Make node-related connections
connect(node_panel_, &NodePanel::NodeSelectionChangedWithContexts,
@@ -380,7 +382,7 @@ void MainWindow::ToggleMaximizedPanel()
premaximized_state_.clear();
currently_focused_panel->raise();
currently_focused_panel->setFocus();
currently_focused_panel->setFocus(Qt::ActiveWindowFocusReason);
PanelManager::instance()->SetSuppressChangedSignal(false);
}
@@ -428,7 +430,7 @@ void MainWindow::SetProject(Project *p)
project_panel_->set_project(p);
if (project_) {
project_panel_->setFocus();
project_panel_->setFocus(Qt::OtherFocusReason);
}
}