Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

rewrite ActivateWindow

Browse Source
This commit is contained in:
arm64v8a
2023-07-10 11:53:51 +09:00
parent 071b593f0d
commit db3c26671b
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/GuiUtils.hpp
View File

@@ -1,9 +1,5 @@
#pragma once #pragma once
#ifdef Q_OS_WIN
#include "sys/windows/guihelper.h"
#endif
// Dialogs // Dialogs
#define Dialog_DialogBasicSettings "DialogBasicSettings" #define Dialog_DialogBasicSettings "DialogBasicSettings"
@@ -80,23 +76,7 @@
if (result.isEmpty()) CACHE.a = ""; \ if (result.isEmpty()) CACHE.a = ""; \
editor->deleteLater(); editor->deleteLater();
// System //
#define _ACTIVE_THIS_WINDOW_COMMON \
hide(); \
showMinimized(); \
showNormal(); \
activateWindow(); \
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); \
raise();
#ifdef Q_OS_WIN
#define ACTIVE_THIS_WINDOW \
_ACTIVE_THIS_WINDOW_COMMON \
Windows_QWidget_SetForegroundWindow(this);
#else
#define ACTIVE_THIS_WINDOW _ACTIVE_THIS_WINDOW_COMMON
#endif
#define ADD_ASTERISK(parent) \ #define ADD_ASTERISK(parent) \
for (auto label: parent->findChildren<QLabel *>()) { \ for (auto label: parent->findChildren<QLabel *>()) { \

14
main/NekoGui_Utils.cpp
View File

@@ -18,6 +18,10 @@
#include <QDateTime> #include <QDateTime>
#include <QLocale> #include <QLocale>
#ifdef Q_OS_WIN
#include "sys/windows/guihelper.h"
#endif
QStringList SplitLines(const QString &_string) { QStringList SplitLines(const QString &_string) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return _string.split(QRegularExpression("[\r\n]"), Qt::SplitBehaviorFlags::SkipEmptyParts); return _string.split(QRegularExpression("[\r\n]"), Qt::SplitBehaviorFlags::SkipEmptyParts);
@@ -211,6 +215,16 @@ int MessageBoxInfo(const QString &title, const QString &text) {
return QMessageBox::information(GetMessageBoxParent(), title, text); return QMessageBox::information(GetMessageBoxParent(), title, text);
} }
void ActivateWindow(QWidget *w) {
w->setWindowState(w->windowState() & ~Qt::WindowMinimized);
w->setVisible(true);
#ifdef Q_OS_WIN
Windows_QWidget_SetForegroundWindow(w);
#endif
w->raise();
w->activateWindow();
}
void runOnUiThread(const std::function<void()> &callback, QObject *parent) { void runOnUiThread(const std::function<void()> &callback, QObject *parent) {
// any thread // any thread
auto *timer = new QTimer(); auto *timer = new QTimer();

4
main/NekoGui_Utils.hpp
View File

@@ -147,6 +147,10 @@ int MessageBoxWarning(const QString &title, const QString &text);
int MessageBoxInfo(const QString &title, const QString &text); int MessageBoxInfo(const QString &title, const QString &text);
void ActivateWindow(QWidget *w);
//
void runOnUiThread(const std::function<void()> &callback, QObject *parent = nullptr); void runOnUiThread(const std::function<void()> &callback, QObject *parent = nullptr);
void runOnNewThread(const std::function<void()> &callback); void runOnNewThread(const std::function<void()> &callback);

4
ui/mainwindow.cpp
View File

@@ -251,7 +251,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
if (this->isVisible()) { if (this->isVisible()) {
hide(); hide();
} else { } else {
ACTIVE_THIS_WINDOW ActivateWindow(this);
} }
} }
}); });
@@ -554,7 +554,7 @@ void MainWindow::dialog_message_impl(const QString &sender, const QString &info)
this->exit_reason = 2; this->exit_reason = 2;
on_menu_exit_triggered(); on_menu_exit_triggered();
} else if (info == "Raise") { } else if (info == "Raise") {
ACTIVE_THIS_WINDOW ActivateWindow(this);
} else if (info == "ClearConnectionList") { } else if (info == "ClearConnectionList") {
refresh_connection_list({}); refresh_connection_list({});
} }