Software/iDescriptor
1
0
Fork 0
mirror of https://github.com/iDescriptor/iDescriptor.git synced 2026-06-21 19:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up unused Windows widget code and improve UI handling

Browse Source
This commit is contained in:
uncor3
2026-04-08 16:38:00 +03:00
parent 4771ff4e8e
commit 13a3455f3c
14 changed files with 70 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/appinstalldialog.cpp
-26
View File
@@ -19,32 +19,6 @@
#include "appinstalldialog.h"
namespace
{
void setLabelTextColor(QLabel *label, const QColor &color)
{
if (!label) {
return;
}
QPalette pal = label->palette();
pal.setColor(QPalette::WindowText, color);
label->setPalette(pal);
}
void resetLabelTextColor(QLabel *label)
{
if (!label) {
return;
}
QWidget *parent = label->parentWidget();
QPalette pal = label->palette();
const QPalette basePal =
parent ? parent->palette() : QApplication::palette();
pal.setColor(QPalette::WindowText, basePal.color(QPalette::WindowText));
label->setPalette(pal);
}
} // namespace
AppInstallDialog::AppInstallDialog(const QString &appName,
const QString &description,
const QString &bundleId, QWidget *parent)
src/base/tool.cpp
-1
View File
@@ -19,7 +19,6 @@
#include "tool.h"
#ifdef WIN32
#include "../platform/windows/widgets/wintoolwidget.h"
#include "../platform/windows/win_common.h"
#endif
src/base/tool.h
+1 -4
View File
@@ -26,10 +26,7 @@
#include "../platform/macos/macos.h"
#endif
#ifdef WIN32
#include "../platform/windows/widgets/wintoolwidget.h"
#endif
//FIXME: implement close logic
// TODO: implement auto close logic when device is disconnected
class Tool : public QWidget
{
public:
src/deviceinfowidget.cpp
+4 -14
View File
@@ -131,16 +131,6 @@ DeviceInfoWidget::DeviceInfoWidget(
m_chargingStatusLabel =
new QLabel(device->deviceInfo.batteryInfo.isCharging ? "Charging"
: "Not Charging");
m_chargingStatusLabel->setObjectName("ChargingStatusLabel");
m_chargingStatusLabel->setStyleSheet(mergeStyles(
m_chargingStatusLabel,
(device->deviceInfo.batteryInfo.isCharging
? QString(
"QLabel#ChargingStatusLabel { color: %1; font-size: 14px; }")
.arg(COLOR_GREEN.name())
: QString(
"QLabel#ChargingStatusLabel { color: %1; font-size: 14px; }")
.arg(qApp->palette().color(QPalette::WindowText).name()))));
// Create the layout without a parent widget
QHBoxLayout *chargingLayout = new QHBoxLayout();
chargingLayout->setContentsMargins(0, 0, 0, 0);
@@ -150,6 +140,7 @@ DeviceInfoWidget::DeviceInfoWidget(
m_lightningIconLabel =
new ZIconLabel(QIcon(":/resources/icons/MdiLightningBolt.png"),
" Charging", 1.0, this);
updateChargingStatusIcon();
m_batteryWidget = new BatteryWidget(
qBound<int>(1, device->deviceInfo.batteryInfo.currentBatteryLevel, 100),
@@ -399,14 +390,13 @@ void DeviceInfoWidget::updateChargingStatusIcon()
{
if (m_device->deviceInfo.batteryInfo.isCharging) {
m_chargingStatusLabel->setText("Charging");
// FIXME
// m_chargingStatusLabel->setStyleSheet(
// QString("color: %1;").arg(COLOR_GREEN.name()));
m_chargingStatusLabel->setStyleSheet(
QString("color: %1;").arg(COLOR_GREEN.name()));
m_lightningIconLabel->show();
} else {
m_chargingStatusLabel->setText("Not Charging");
// m_chargingStatusLabel->setStyleSheet("");
m_chargingStatusLabel->setStyleSheet("");
m_lightningIconLabel->hide();
}
}
src/devicesleepwarningwidget.cpp
+5 -3
View File
@@ -7,8 +7,9 @@ DeviceSleepWarningWidget::DeviceSleepWarningWidget(QWidget *parent)
setupWinWindow(this);
#endif
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(0, 20, 0, 0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setSpacing(0);
setMinimumWidth(400);
m_loadingWidget = new ZLoadingWidget(false, this);
mainLayout->addWidget(m_loadingWidget);
@@ -21,7 +22,7 @@ DeviceSleepWarningWidget::DeviceSleepWarningWidget(QWidget *parent)
m_mediaPlayer = new QMediaPlayer(this);
m_videoWidget = new QVideoWidget(this);
m_videoWidget->setMinimumSize(300, 500);
m_videoWidget->setMinimumSize(300, 400);
m_videoWidget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
m_videoWidget->setAspectRatioMode(Qt::KeepAspectRatio);
@@ -56,7 +57,7 @@ DeviceSleepWarningWidget::DeviceSleepWarningWidget(QWidget *parent)
contentLayout->addLayout(textLayout);
contentLayout->addWidget(m_videoWidget);
contentLayout->addSpacing(20);
contentLayout->addSpacing(10);
QCheckBox *dontShowAgain = new QCheckBox("Don't show this again", this);
connect(dontShowAgain, &QCheckBox::toggled, this, [this](bool checked) {
@@ -65,6 +66,7 @@ DeviceSleepWarningWidget::DeviceSleepWarningWidget(QWidget *parent)
});
contentLayout->addWidget(dontShowAgain, 0, Qt::AlignCenter);
contentLayout->addSpacing(10);
m_mediaPlayer->setSource(QUrl("qrc:/resources/unlock.mp4"));
QTimer::singleShot(500, this, &DeviceSleepWarningWidget::init);
}
src/iDescriptor-ui.h
+24 -1
View File
@@ -742,4 +742,27 @@ private:
ZLabel *m_dirLabel;
QPushButton *m_dirButton;
QString m_outputDir;
};
};
inline void setLabelTextColor(QLabel *label, const QColor &color)
{
if (!label) {
return;
}
QPalette pal = label->palette();
pal.setColor(QPalette::WindowText, color);
label->setPalette(pal);
}
inline void resetLabelTextColor(QLabel *label)
{
if (!label) {
return;
}
QWidget *parent = label->parentWidget();
QPalette pal = label->palette();
const QPalette basePal =
parent ? parent->palette() : QApplication::palette();
pal.setColor(QPalette::WindowText, basePal.color(QPalette::WindowText));
label->setPalette(pal);
}
src/main.cpp
+15 -7
View File
@@ -45,13 +45,21 @@ int main(int argc, char *argv[])
"their default values.");
}
#ifdef WIN32
QFile styleFile(detectDarkModeWindows() ? ":/resources/win.dark.qcss"
: ":/resources/win.light.qcss");
if (styleFile.open(QFile::ReadOnly | QFile::Text)) {
const QString style = QString::fromUtf8(styleFile.readAll())
.arg(COLOR_ACCENT_BLUE.name());
qDebug() << "Loaded Windows style sheet successfully.";
a.setStyleSheet(style);
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
QOperatingSystemVersion osVersion = QOperatingSystemVersion::current();
if (osVersion >= QOperatingSystemVersion::Windows11) {
QFile styleFile(detectDarkModeWindows() ? ":/resources/win.dark.qcss"
: ":/resources/win.light.qcss");
if (styleFile.open(QFile::ReadOnly | QFile::Text)) {
const QString style = QString::fromUtf8(styleFile.readAll())
.arg(COLOR_ACCENT_BLUE.name());
qDebug() << "Loaded Windows style sheet successfully.";
a.setStyleSheet(style);
}
} else {
qDebug() << "Windows version is older than 11, not applying winui "
"stylesheet.";
}
QString appPath = QCoreApplication::applicationDirPath();
src/photomodel.cpp
+1 -8
View File
@@ -183,6 +183,7 @@ bool PhotoModel::populatePhotoPaths()
info.fileName = fileName;
info.thumbnailRequested = false;
info.dateTime = creationDateVariant.toDateTime();
info.fileType = determineFileType(fileName);
m_allPhotos.append(info);
}
}
@@ -281,14 +282,6 @@ QString PhotoModel::getFilePath(const QModelIndex &index) const
return QString();
}
PhotoInfo::FileType PhotoModel::getFileType(const QModelIndex &index) const
{
if (index.isValid() && index.row() < m_photos.size()) {
return m_photos.at(index.row()).fileType;
}
return PhotoInfo::Image;
}
QStringList PhotoModel::getAllFilePaths() const
{
QStringList paths;
src/photomodel.h
-1
View File
@@ -75,7 +75,6 @@ public:
// Export functionality
QStringList getSelectedFilePaths(const QModelIndexList &indexes) const;
QString getFilePath(const QModelIndex &index) const;
PhotoInfo::FileType getFileType(const QModelIndex &index) const;
// Get all items for export
QStringList getAllFilePaths() const;
src/platform/windows/widgets/wintoolwidget.cpp
-361
View File
@@ -1,361 +0,0 @@
/*
* iDescriptor: A free and open-source idevice management tool.
*
* Copyright (C) 2025 Uncore <https://github.com/uncor3>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "wintoolwidget.h"
#include "../win_common.h"
#include <QApplication>
#include <QOperatingSystemVersion>
#include <QScreen>
#include <QStyle>
#include <QWindow>
#include <windows.h>
#include <windowsx.h> // GET_X_LPARAM, GET_Y_LPARAM
static const int TITLE_BAR_HEIGHT = 32;
// FIXME: custom title bar functionality
// doesnt work properly with Mica effetcs applied, need to investigate further
WinToolWidget::WinToolWidget(QWidget *parent)
: QWidget(parent), m_min_btn{nullptr}, m_max_btn{nullptr},
m_close_btn{nullptr}, m_resize_border_width{6}
{
m_hwnd = (HWND)winId();
setupWinWindow(this);
QObject::connect(windowHandle(), &QWindow::screenChanged, this,
&WinToolWidget::onScreenChanged);
// Add widget. (Initialize central widget)
QWidget *entire_widget = this;
setContentsMargins(0, 0, 0, 0);
// Layout for entire widgets.
QVBoxLayout *entire_layout = new QVBoxLayout(this);
entire_widget->setLayout(entire_layout);
entire_layout->setContentsMargins(0, 0, 0, 0);
entire_layout->setSpacing(0);
// Initialize title bar widget
m_titlebar_widget = new QWidget(this);
entire_layout->addWidget(m_titlebar_widget);
m_titlebar_widget->setFixedHeight(35); // Default title bar height is 35
m_titlebar_widget->setContentsMargins(0, 0, 0, 0);
m_titlebar_widget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Fixed);
// Layout for title bar
QHBoxLayout *titlebar_layout = new QHBoxLayout(this);
m_titlebar_widget->setLayout(titlebar_layout);
titlebar_layout->setContentsMargins(0, 0, 0, 0);
titlebar_layout->setSpacing(0);
QWidget *custom_titlebar_widget = new QWidget(this);
titlebar_layout->addWidget(custom_titlebar_widget);
custom_titlebar_widget->setContentsMargins(0, 0, 0, 0);
custom_titlebar_widget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
// Caption buttons – sized like Windows (46×32 for min/max, 46×32 for close)
auto makeBtn = [&](const QString &icon, const QString &normalBg,
const QString &hoverBg,
const QString &pressBg) -> QPushButton * {
auto *btn = new QPushButton(icon, this);
btn->setFixedSize(46, TITLE_BAR_HEIGHT);
btn->setFlat(true);
btn->setFocusPolicy(Qt::NoFocus);
btn->setCursor(Qt::ArrowCursor);
btn->setStyleSheet(
QString("QPushButton { background:%1; color:white; border:none;"
" font-size:10px; font-family:'Segoe MDL2 "
"Assets','Segoe UI Symbol'; }"
"QPushButton:hover { background:%2; }"
"QPushButton:pressed{ background:%3; }")
.arg(normalBg, hoverBg, pressBg));
return btn;
};
// U+E921 minimize, U+E922 restore/maximize, U+E8BB close (Segoe MDL2
// Assets)
m_min_btn = makeBtn("\uE921", "transparent", "rgba(255,255,255,30)",
"rgba(255,255,255,20)");
m_max_btn = makeBtn("\uE922", "transparent", "rgba(255,255,255,30)",
"rgba(255,255,255,20)");
m_close_btn = makeBtn("\uE8BB", "transparent", "#C42B1C", "#9B1B0F");
titlebar_layout->addWidget(m_min_btn);
titlebar_layout->addWidget(m_max_btn);
titlebar_layout->addWidget(m_close_btn);
// Layout for title bar customization.
m_custom_titlebar_layout = new QHBoxLayout(custom_titlebar_widget);
custom_titlebar_widget->setLayout(m_custom_titlebar_layout);
m_custom_titlebar_layout->setContentsMargins(0, 0, 0, 0);
m_custom_titlebar_layout->setSpacing(0);
m_custom_titlebar_layout->setAlignment(Qt::AlignLeft);
QObject::connect(m_min_btn, &QPushButton::clicked, this,
&WinToolWidget::onMinimizeButtonClicked);
QObject::connect(m_max_btn, &QPushButton::clicked, this,
&WinToolWidget::onMaximizeButtonClicked);
QObject::connect(m_close_btn, &QPushButton::clicked, this,
&WinToolWidget::onCloseButtonClicked);
entire_layout->setAlignment(titlebar_layout, Qt::AlignTop);
m_content_widget = new QWidget(this);
entire_layout->addWidget(m_content_widget);
// m_content_layout = new QVBoxLayout(m_content_widget);
m_content_widget->setContentsMargins(0, 0, 0, 0);
m_content_widget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
// Set default title bar palette.
auto pal = m_titlebar_widget->palette();
pal.setColor(QPalette::Window, QColor(30, 34, 39));
m_titlebar_widget->setAutoFillBackground(true);
m_titlebar_widget->setPalette(pal);
// Set default content widget palette.
pal = m_content_widget->palette();
pal.setColor(QPalette::Window, QColor(35, 39, 46));
m_content_widget->setAutoFillBackground(true);
m_content_widget->setPalette(pal);
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool WinToolWidget::nativeEvent(const QByteArray &event_type, void *message,
long *result)
#else
bool WinToolWidget::nativeEvent(const QByteArray &event_type, void *message,
qintptr *result)
#endif
{
MSG *msg = (MSG *)message;
switch (msg->message) {
// Remove the default window frame by hooking the WM_NCCALCSIZE message.
case WM_NCCALCSIZE: {
if (msg->lParam) {
WINDOWPLACEMENT wp;
GetWindowPlacement(m_hwnd, &wp);
if (wp.showCmd == SW_MAXIMIZE) {
NCCALCSIZE_PARAMS *sz = (NCCALCSIZE_PARAMS *)msg->lParam;
sz->rgrc[0].left += 8;
sz->rgrc[0].top += 8;
sz->rgrc[0].right -= 8;
sz->rgrc[0].bottom -= 8;
}
}
return true;
}
// Process the mouse when it is on the window border.
case WM_NCHITTEST: {
RECT winrect;
GetWindowRect(msg->hwnd, &winrect);
long x = GET_X_LPARAM(msg->lParam);
long y = GET_Y_LPARAM(msg->lParam);
long local_x = x - winrect.left;
long local_y = y - winrect.top;
if (x >= winrect.left && x < winrect.left + m_resize_border_width &&
y < winrect.bottom && y >= winrect.bottom - m_resize_border_width) {
*result = HTBOTTOMLEFT;
return true;
}
if (x < winrect.right && x >= winrect.right - m_resize_border_width &&
y < winrect.bottom && y >= winrect.bottom - m_resize_border_width) {
*result = HTBOTTOMRIGHT;
return true;
}
if (x >= winrect.left && x < winrect.left + m_resize_border_width &&
y >= winrect.top && y < winrect.top + m_resize_border_width) {
*result = HTTOPLEFT;
return true;
}
if (x < winrect.right && x >= winrect.right - m_resize_border_width &&
y >= winrect.top && y < winrect.top + m_resize_border_width) {
*result = HTTOPRIGHT;
return true;
}
if (x >= winrect.left && x < winrect.left + m_resize_border_width) {
*result = HTLEFT;
return true;
}
if (x < winrect.right && x >= winrect.right - m_resize_border_width) {
*result = HTRIGHT;
return true;
}
if (y < winrect.bottom && y >= winrect.bottom - m_resize_border_width) {
*result = HTBOTTOM;
return true;
}
if (y >= winrect.top && y < winrect.top + m_resize_border_width) {
*result = HTTOP;
return true;
}
// Check the area where the user can click to move the window.
if (determineNonClickableWidgetUnderMouse(m_custom_titlebar_layout,
local_x, local_y)) {
*result = HTCAPTION;
return true;
}
*result = HTTRANSPARENT;
break;
}
case WM_SIZE: {
if (m_max_btn) {
WINDOWPLACEMENT wp;
GetWindowPlacement(m_hwnd, &wp);
m_max_btn->setChecked(wp.showCmd == SW_MAXIMIZE ? true : false);
}
break;
}
default:
break;
}
return false;
}
// This is used to change the `active` state of widgets in custom title bar.
bool WinToolWidget::event(QEvent *evt)
{
switch (evt->type()) {
case QEvent::WindowActivate: {
#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
m_close_btn->setStyleSheet(m_close_btn->styleSheet());
m_min_btn->setStyleSheet(m_min_btn->styleSheet());
m_max_btn->setStyleSheet(m_max_btn->styleSheet());
#endif
propagateActiveStateInCustomTitlebar(m_custom_titlebar_layout, true);
break;
}
case QEvent::WindowDeactivate: {
#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
m_close_btn->setStyleSheet(m_close_btn->styleSheet());
m_min_btn->setStyleSheet(m_min_btn->styleSheet());
m_max_btn->setStyleSheet(m_max_btn->styleSheet());
#endif
propagateActiveStateInCustomTitlebar(m_custom_titlebar_layout, false);
break;
}
default:
break;
}
return QWidget::event(evt);
}
// Determine whether the current mouse coordinate is on the non-clickable widget
// or not using a recursive method.
bool WinToolWidget::determineNonClickableWidgetUnderMouse(QLayout *layout,
int x, int y)
{
if (!layout->count() && layout->geometry().contains(x, y))
return true;
for (size_t i = 0; i < layout->count(); i++) {
auto item = layout->itemAt(i)->widget();
if (item) {
if (item->geometry().contains(x, y))
return !item->property("clickable widget").toBool();
} else {
auto child_layout = layout->itemAt(i)->layout();
if (child_layout && child_layout->geometry().contains(x, y))
return determineNonClickableWidgetUnderMouse(child_layout, x,
y);
}
}
return false;
}
// Set `active' state using recursive method.
void WinToolWidget::propagateActiveStateInCustomTitlebar(QLayout *layout,
bool active_state)
{
for (size_t i = 0; i < layout->count(); i++) {
auto item = layout->itemAt(i)->widget();
if (item) {
item->setProperty("active", active_state);
item->setStyleSheet(item->styleSheet());
} else {
auto child_layout = layout->itemAt(i)->layout();
if (child_layout)
propagateActiveStateInCustomTitlebar(child_layout,
active_state);
}
}
}
QWidget &WinToolWidget::getTitlebarWidget() { return *m_titlebar_widget; }
QHBoxLayout &WinToolWidget::getCustomTitlebarLayout()
{
return *m_custom_titlebar_layout;
}
void WinToolWidget::setResizeBorderWidth(const int &resize_border_width)
{
m_resize_border_width = resize_border_width;
}
void WinToolWidget::setTitlebarHeight(const int &titlebar_height)
{
m_titlebar_widget->setFixedHeight(titlebar_height);
}
// Render again when frame is moved to another monitor.
void WinToolWidget::onScreenChanged(QScreen *screen)
{
SetWindowPos(m_hwnd, NULL, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER |
SWP_FRAMECHANGED | SWP_NOACTIVATE);
}
void WinToolWidget::onMinimizeButtonClicked()
{
SendMessage(m_hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
}
void WinToolWidget::onMaximizeButtonClicked()
{
SendMessage(m_hwnd, WM_SYSCOMMAND,
m_max_btn->isChecked() ? SC_MAXIMIZE : SC_RESTORE, 0);
// Remove the hover state from the maximize button.
m_max_btn->setAttribute(Qt::WA_UnderMouse, false);
}
void WinToolWidget::onCloseButtonClicked()
{
SendMessage(m_hwnd, WM_CLOSE, 0, 0);
}
QWidget *WinToolWidget::contentWidget() { return m_content_widget; }
src/platform/windows/widgets/wintoolwidget.h
-76
View File
@@ -1,76 +0,0 @@
/*
* iDescriptor: A free and open-source idevice management tool.
*
* Copyright (C) 2025 Uncore <https://github.com/uncor3>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef WINTOOLWIDGET_H
#define WINTOOLWIDGET_H
#include "../win_common.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QMouseEvent>
#include <QPoint>
#include <QPushButton>
#include <QVBoxLayout>
#include <QWidget>
class WinToolWidget : public QWidget
{
Q_OBJECT
HWND m_hwnd;
int m_resize_border_width;
QPushButton *m_min_btn;
QPushButton *m_max_btn;
QPushButton *m_close_btn;
QWidget *m_content_widget;
QVBoxLayout *m_content_layout;
QWidget *m_titlebar_widget;
QHBoxLayout *m_custom_titlebar_layout;
QColor m_titleBarColor;
public:
explicit WinToolWidget(QWidget *parent = nullptr);
void setResizeBorderWidth(const int &resize_border_width);
void setTitlebarHeight(const int &titlebar_height);
QWidget &getTitlebarWidget();
QHBoxLayout &getCustomTitlebarLayout();
private:
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool nativeEvent(const QByteArray &event_type, void *message, long *result);
#else
bool nativeEvent(const QByteArray &event_type, void *message,
qintptr *result);
#endif
bool event(QEvent *evt);
bool determineNonClickableWidgetUnderMouse(QLayout *layout, int x, int y);
void propagateActiveStateInCustomTitlebar(QLayout *layout,
bool active_state);
void onScreenChanged(QScreen *screen);
void onMinimizeButtonClicked();
void onMaximizeButtonClicked();
void onCloseButtonClicked();
protected:
QWidget *contentWidget();
};
#endif // WINTOOLWIDGET_H
src/platform/windows/win_common.h
+12 -7
View File
@@ -99,16 +99,19 @@ inline bool detectDarkModeWindows()
inline void setupWinWindow(QWidget *window)
{
QOperatingSystemVersion osVersion = QOperatingSystemVersion::current();
if (osVersion < QOperatingSystemVersion::Windows11)
return;
window->setAttribute(Qt::WA_TranslucentBackground);
HWND hwnd = reinterpret_cast<HWND>(window->winId());
enableMica(hwnd);
// use mica on Windows 11
QOperatingSystemVersion osVersion = QOperatingSystemVersion::current();
if (osVersion >= QOperatingSystemVersion::Windows11) {
enableMica(hwnd);
} else {
enableAcrylic(hwnd);
}
/*
normally we had plans to enable acrylic on win 10 but since it's
untested and may cause issues, we'll just enable mica on win 11 and above
for now
*/
// enableAcrylic(hwnd);
}
enum CornerPreference : int {
@@ -117,6 +120,8 @@ enum CornerPreference : int {
Corner_Round = DWMWCP_ROUND,
Corner_RoundSmall = DWMWCP_ROUNDSMALL
};
/* apparently this only works on Win 11 but should not crash on older versions
*/
inline void SetCorner(HWND hwnd, CornerPreference corner)
{
if (corner != Corner_Default) {
src/settingsmanager.cpp
+6 -1
View File
@@ -266,6 +266,10 @@ void SettingsManager::resetToDefaults()
setShowV4L2(false);
#endif
setIsSleepyDeviceWarningDismissed(false);
#ifdef WIN32
setWinBackdropType(ACRYLIC);
#endif
}
void SettingsManager::saveFavoritePlace(const QString &path,
@@ -501,7 +505,8 @@ void SettingsManager::setWinBackdropType(WIN_BACKDROP type)
WIN_BACKDROP SettingsManager::winBackdropType() const
{
return static_cast<WIN_BACKDROP>(
m_settings->value("winBackdropType", static_cast<int>(MICA)).toInt());
m_settings->value("winBackdropType", static_cast<int>(ACRYLIC))
.toInt());
}
#endif
src/settingswidget.cpp
+2 -2
View File
@@ -520,8 +520,8 @@ void SettingsWidget::saveSettings()
if (m_backDropTypeCombo) {
const QVariant data = m_backDropTypeCombo->currentData();
if (!data.isValid()) {
// Mica
sm->setWinBackdropType(static_cast<WIN_BACKDROP>(2));
// AUTO = ACRYLIC
sm->setWinBackdropType(static_cast<WIN_BACKDROP>(ACRYLIC));
} else {
sm->setWinBackdropType(static_cast<WIN_BACKDROP>(data.toInt()));
}