Skip to content

[200_61] 适配 Wayland 平台支持 #3267

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

Open
ACG-j wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

[200_61] 适配 Wayland 平台支持 #3267

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
6 changes: 0 additions & 6 deletions src/Mogan/Research/research.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,6 @@ main (int argc, char** argv) {
else if (theme != "") tm_style_sheet= theme;
#if !defined(OS_MINGW) && !defined(OS_WIN)
set_env ("LC_NUMERIC", "POSIX");
#ifndef OS_MACOS
#ifndef OS_WASM
set_env ("QT_QPA_PLATFORM", "xcb");
set_env ("XDG_SESSION_TYPE", "x11");
#endif
#endif
#endif
#ifdef MACOSX_EXTENSIONS
// Reset TeXmacs if Alt is pressed during startup
Expand Down
12 changes: 10 additions & 2 deletions src/Plugins/Qt/qt_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
#ifdef qt_static_plugin_xcb
Q_IMPORT_PLUGIN (QXcbIntegrationPlugin)
#endif
#ifdef qt_static_plugin_qwayland
Q_IMPORT_PLUGIN (QWaylandIntegrationPlugin)
#endif
#ifdef qt_static_plugin_qjpeg
Q_IMPORT_PLUGIN (qjpeg)
#endif
Expand Down Expand Up @@ -194,8 +197,13 @@ qt_gui_rep::qt_gui_rep (int& argc, char** argv)
debug_boot << "Screen extents: " << w / PIXEL << " x " << h / PIXEL
<< "\n";
if (min (w, h) >= 1440 * PIXEL) {
retina_zoom = 2;
retina_scale= (tm_style_sheet == "" ? 1.0 : 1.6666);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (QGuiApplication::platformName () != "wayland")
#endif
{
retina_zoom = 2;
retina_scale= (tm_style_sheet == "" ? 1.0 : 1.6666);
}
if (!retina_iman) {
retina_iman = true;
retina_icons= 2;
Expand Down
Loading