Skip to content

fix: [Font-size] The Font size can not change by dde-control-center. #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLumia merged 1 commit into from
Apr 23, 2025
Merged

fix: [Font-size] The Font size can not change by dde-control-center. #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions shell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# SPDX-License-Identifier: CC0-1.0

find_package(Dtk${DTK_VERSION_MAJOR} COMPONENTS Widget REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Widgets Gui WaylandClient)
find_package(TreelandProtocols REQUIRED)
pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)
Expand Down Expand Up @@ -41,6 +42,7 @@ target_link_libraries(dde-shell PRIVATE
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::WaylandClient
Dtk${DTK_VERSION_MAJOR}::Gui
Dtk${DTK_VERSION_MAJOR}::Widget
Qt${QT_VERSION_MAJOR}::DBus
PkgConfig::WaylandClient
)
Expand Down
4 changes: 3 additions & 1 deletion shell/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

#include <QApplication>
#include <QCommandLineOption>
#include <QCommandLineParser>

Check warning on line 7 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QCommandLineParser> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QStandardPaths>

Check warning on line 8 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QStandardPaths> not found. Please note: Cppcheck does not need standard library headers to get proper results.

#include <DApplication>

Check warning on line 10 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DApplication> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DGuiApplicationHelper>

Check warning on line 11 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DGuiApplicationHelper> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DLog>

Check warning on line 12 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DLog> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QQuickWindow>

Check warning on line 13 in shell/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QQuickWindow> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QWindow>

#include <csignal>
Expand All @@ -24,6 +25,7 @@

DS_USE_NAMESPACE
DGUI_USE_NAMESPACE
DWIDGET_USE_NAMESPACE

DS_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(dsLog)
Expand Down Expand Up @@ -95,7 +97,7 @@
{
setenv("DSG_APP_ID", "org.deepin.dde.shell", 0);
DGuiApplicationHelper::setAttribute(DGuiApplicationHelper::UseInactiveColorGroup, false);
QApplication a(argc, argv);
DApplication a(argc, argv);
// Don't apply to plugins
qunsetenv("QT_SCALE_FACTOR");
// dde-shell contains UI controls based on QML and Widget technologies.
Expand Down