Revert "Force enable fractional-scale-v1 experimental option"
This reverts commit 4696f731da
.
This commit is contained in:
parent
931c17418d
commit
ea37e83b13
|
@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "core/local_url_handlers.h"
|
#include "core/local_url_handlers.h"
|
||||||
#include "core/update_checker.h"
|
#include "core/update_checker.h"
|
||||||
#include "core/deadlock_detector.h"
|
#include "core/deadlock_detector.h"
|
||||||
#include "base/options.h"
|
|
||||||
#include "base/timer.h"
|
#include "base/timer.h"
|
||||||
#include "base/concurrent_timer.h"
|
#include "base/concurrent_timer.h"
|
||||||
#include "base/invoke_queued.h"
|
#include "base/invoke_queued.h"
|
||||||
|
@ -38,24 +37,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
namespace Core {
|
namespace Core {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
base::options::toggle OptionForceWaylandFractionalScaling({
|
|
||||||
.id = kOptionForceWaylandFractionalScaling,
|
|
||||||
.name = "Enable xdg-output fractional scaling",
|
|
||||||
.description = "Enable xdg-output based fractional scaling on Wayland. "
|
|
||||||
"This works without fractional-scale-v1 and without "
|
|
||||||
"precise High DPI scaling. "
|
|
||||||
"Requires Qt with Desktop App Toolkit patches.",
|
|
||||||
.defaultValue = true,
|
|
||||||
.scope = [] {
|
|
||||||
#ifdef DESKTOP_APP_QT_PATCHED
|
|
||||||
return Platform::IsWayland();
|
|
||||||
#else // DESKTOP_APP_QT_PATCHED
|
|
||||||
return false;
|
|
||||||
#endif // !DESKTOP_APP_QT_PATCHED
|
|
||||||
},
|
|
||||||
.restartRequired = true,
|
|
||||||
});
|
|
||||||
|
|
||||||
QChar _toHex(ushort v) {
|
QChar _toHex(ushort v) {
|
||||||
v = v & 0x000F;
|
v = v & 0x000F;
|
||||||
return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
|
return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
|
||||||
|
@ -96,17 +77,12 @@ QString _escapeFrom7bit(const QString &str) {
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
const char kOptionForceWaylandFractionalScaling[] = "force-wayland-fractional-scaling";
|
|
||||||
|
|
||||||
bool Sandbox::QuitOnStartRequested = false;
|
bool Sandbox::QuitOnStartRequested = false;
|
||||||
|
|
||||||
Sandbox::Sandbox(int &argc, char **argv)
|
Sandbox::Sandbox(int &argc, char **argv)
|
||||||
: QApplication(argc, argv)
|
: QApplication(argc, argv)
|
||||||
, _mainThreadId(QThread::currentThreadId()) {
|
, _mainThreadId(QThread::currentThreadId()) {
|
||||||
setQuitOnLastWindowClosed(false);
|
setQuitOnLastWindowClosed(false);
|
||||||
if (OptionForceWaylandFractionalScaling.value()) {
|
|
||||||
setProperty("_q_force_wayland_fractional_scale", true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int Sandbox::start() {
|
int Sandbox::start() {
|
||||||
|
|
|
@ -19,8 +19,6 @@ class QLockFile;
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
extern const char kOptionForceWaylandFractionalScaling[];
|
|
||||||
|
|
||||||
class UpdateChecker;
|
class UpdateChecker;
|
||||||
class Application;
|
class Application;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "ui/chat/chat_style_radius.h"
|
#include "ui/chat/chat_style_radius.h"
|
||||||
#include "base/options.h"
|
#include "base/options.h"
|
||||||
#include "core/application.h"
|
#include "core/application.h"
|
||||||
#include "core/sandbox.h"
|
|
||||||
#include "core/launcher.h"
|
#include "core/launcher.h"
|
||||||
#include "chat_helpers/tabbed_panel.h"
|
#include "chat_helpers/tabbed_panel.h"
|
||||||
#include "dialogs/dialogs_widget.h"
|
#include "dialogs/dialogs_widget.h"
|
||||||
|
@ -144,7 +143,6 @@ void SetupExperimental(
|
||||||
addToggle(ChatHelpers::kOptionTabbedPanelShowOnClick);
|
addToggle(ChatHelpers::kOptionTabbedPanelShowOnClick);
|
||||||
addToggle(Dialogs::kOptionForumHideChatsList);
|
addToggle(Dialogs::kOptionForumHideChatsList);
|
||||||
addToggle(Core::kOptionFractionalScalingEnabled);
|
addToggle(Core::kOptionFractionalScalingEnabled);
|
||||||
addToggle(Core::kOptionForceWaylandFractionalScaling);
|
|
||||||
addToggle(Window::kOptionViewProfileInChatsListContextMenu);
|
addToggle(Window::kOptionViewProfileInChatsListContextMenu);
|
||||||
addToggle(Info::Profile::kOptionShowPeerIdBelowAbout);
|
addToggle(Info::Profile::kOptionShowPeerIdBelowAbout);
|
||||||
addToggle(Ui::GL::kOptionAllowLinuxNvidiaOpenGL);
|
addToggle(Ui::GL::kOptionAllowLinuxNvidiaOpenGL);
|
||||||
|
|
|
@ -54,7 +54,7 @@ FROM builder AS patches
|
||||||
RUN git init patches \
|
RUN git init patches \
|
||||||
&& cd patches \
|
&& cd patches \
|
||||||
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
|
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
|
||||||
&& git fetch --depth=1 origin 12780ae73abe21d00ae125e284d8bca9d8993948 \
|
&& git fetch --depth=1 origin d66c16d044de61fb6ca6c418e7ef3ed4a60f5f7f \
|
||||||
&& git reset --hard FETCH_HEAD \
|
&& git reset --hard FETCH_HEAD \
|
||||||
&& rm -rf .git
|
&& rm -rf .git
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue