aiden
/
core
mirror of https://github.com/cutefishos/core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix setting HiDPI

Browse Source
pull/9/head
reionwong 4 years ago
parent 1103c69cae
commit 86aa0aea0c
8 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
session/application.cpp
Unescape Escape View File

@ -145,7 +145,7 @@ void Application::initEnvironments()
qunsetenv("QT_FONT_DPI");
qputenv("QT_SCALE_FACTOR_ROUNDING_POLICY", "PassThrough");
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
// qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
// IM Config
qputenv("GTK_IM_MODULE", "fcitx5");

16
settings-daemon/theme/thememanager.cpp
Unescape Escape View File

@ -163,14 +163,24 @@ void ThemeManager::setDevicePixelRatio(qreal ratio)
// Set font dpi
// ref kscreen.
if (qFuzzyCompare(ratio, 1.0)) {
// if dpi is the default (96) remove the entry rather than setting it
const int scaleDpi = qRound(ratio * 96.0);
QProcess proc;
proc.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-remove"), QStringLiteral("-nocpp")});
proc.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
if (proc.waitForStarted()) {
proc.write(QByteArray("Xft.dpi\n"));
proc.write(QByteArray("Xft.dpi: " + QString::number(scaleDpi).toLatin1()));
proc.closeWriteChannel();
proc.waitForFinished();
}
// if dpi is the default (96) remove the entry rather than setting it
// QProcess proc;
// proc.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-remove"), QStringLiteral("-nocpp")});
// if (proc.waitForStarted()) {
// proc.write(QByteArray("Xft.dpi\n"));
// proc.closeWriteChannel();
// proc.waitForFinished();
// }
m_settings->setValue("forceFontDPI", 0);
} else {
const int scaleDpi = qRound(ratio * 96.0);

8
shutdown-ui/IconButton.qml
Unescape Escape View File

@ -29,6 +29,7 @@ Item {
property string text
property string icon
property int iconSize: 52
property bool checked: false
signal clicked
@ -56,7 +57,7 @@ Item {
ColumnLayout {
id: layout
anchors.fill: parent
spacing: FishUI.Units.smallSpacing
spacing: FishUI.Units.largeSpacing
Item {
Layout.fillHeight: true
@ -65,10 +66,9 @@ Item {
Image {
id: image
source: control.icon
width: control.width * 0.5
sourceSize: Qt.size(width, height)
width: control.iconSize
height: width
sourceSize.width: width
sourceSize.height: width
Layout.alignment: Qt.AlignCenter
}

4
shutdown-ui/icons/system-lock-screen.svg
Unescape Escape View File

@ -1,8 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#363636;
}</style>
</defs>
<path class="ColorScheme-Text" d="m16 4c-6.6274 0-12 5.3726-12 12s5.3726 12 12 12 12-5.3726 12-12-5.3726-12-12-12zm0 1c6.0751 0 11 4.9249 11 11s-4.9249 11-11 11-11-4.9249-11-11 4.9249-11 11-11zm-0.039062 2c-2.216 0-4 1.784-4 4v4h-1.0938c-1.0341 0-1.8672 0.892-1.8672 2v4c0 1.108 0.83305 2 1.8672 2h10.266c1.0341 0 1.8672-0.892 1.8672-2v-4c0-1.108-0.83305-2-1.8672-2h-1.1719v-4c0-2.216-1.784-4-4-4zm0 1c1.662 0 3 1.561 3 3.5v3.5h-6v-3.5c0-1.939 1.338-3.5 3-3.5zm-4.9609 8h10c0.554 0 1 0.446 1 1v4c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-4c0-0.554 0.446-1 1-1z" fill="#fff"/>
<path class="ColorScheme-Text" d="m12 1c-6.0751 0-11 4.9249-11 11 0 6.0751 4.9249 11 11 11 6.0751 0 11-4.9249 11-11 0-6.0751-4.9249-11-11-11zm0 0.91667c5.5688 0 10.083 4.5145 10.083 10.083 0 5.5688-4.5145 10.083-10.083 10.083-5.5688 0-10.083-4.5145-10.083-10.083 0-5.5688 4.5145-10.083 10.083-10.083zm-0.0358 1.8333c-2.0313 0-3.6667 1.6353-3.6667 3.6667v3.6667h-1.0026c-0.94792 0-1.7116 0.81767-1.7116 1.8333v3.6667c0 1.0157 0.76363 1.8333 1.7116 1.8333h9.4105c0.94792 0 1.7116-0.81767 1.7116-1.8333v-3.6667c0-1.0157-0.76363-1.8333-1.7116-1.8333h-1.0742v-3.6667c0-2.0313-1.6353-3.6667-3.6667-3.6667zm0 0.91667c1.5235 0 2.75 1.4309 2.75 3.2083v3.2083h-5.5v-3.2083c0-1.7774 1.2265-3.2083 2.75-3.2083zm-4.5475 7.3333h9.1667c0.50783 0 0.91667 0.40883 0.91667 0.91667v3.6667c0 0.50783-0.40883 0.91667-0.91667 0.91667h-9.1667c-0.50783 0-0.91667-0.40883-0.91667-0.91667v-3.6667c0-0.50783 0.40883-0.91667 0.91667-0.91667z" fill="#fff" stroke-width=".91667"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 1.2 KiB

4
shutdown-ui/icons/system-log-out.svg
Unescape Escape View File

@ -1,8 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#dedede;
}</style>
</defs>
<path class="ColorScheme-Text" d="m16 4a12 12 0 0 0-12 12 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-12-12zm0 1a11 11 0 0 1 11 11 11 11 0 0 1-11 11 11 11 0 0 1-11-11 11 11 0 0 1 11-11zm3.2695 3-8.2695 8 8.2695 8 0.73047-0.70703-7.5391-7.293 7.5391-7.293-0.73047-0.70703z" fill="#fff"/>
<path class="ColorScheme-Text" d="m12 1a11 11 0 0 0-11 11 11 11 0 0 0 11 11 11 11 0 0 0 11-11 11 11 0 0 0-11-11zm0 0.91667a10.083 10.083 0 0 1 10.083 10.083 10.083 10.083 0 0 1-10.083 10.083 10.083 10.083 0 0 1-10.083-10.083 10.083 10.083 0 0 1 10.083-10.083zm2.997 2.75-7.5804 7.3333 7.5804 7.3333 0.6696-0.64167-6.9108-6.6917 6.9108-6.6917z" fill="#fff" stroke-width=".91667"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 613 B

4
shutdown-ui/icons/system-reboot.svg
Unescape Escape View File

@ -1,8 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#dedede;
}</style>
</defs>
<path class="ColorScheme-Text" d="m4 16a12 12 0 0 1 1.6719-6.084l5.3789 5.377-0.71094 0.70703-4.4043-4.4043a11 11 0 0 0-0.93555 4.4043 11 11 0 0 0 11 11 11 11 0 0 0 5.3516-1.4043l0.72852 0.73242a12 12 0 0 1-6.0801 1.6719 12 12 0 0 1-12-12zm5.916-10.328a12 12 0 0 1 6.084-1.6719 12 12 0 0 1 12 12 12 12 0 0 1-1.6719 6.084l-5.3789-5.377 0.70703-0.70703 4.4043 4.4062a11 11 0 0 0 0.93945-4.4062 11 11 0 0 0-11-11 11 11 0 0 0-5.3516 1.4043z" fill="#fff"/>
<path class="ColorScheme-Text" d="m1 12a11 11 0 0 1 1.5326-5.577l4.9307 4.9289-0.65169 0.64811-4.0373-4.0373a10.083 10.083 0 0 0-0.85759 4.0373 10.083 10.083 0 0 0 10.083 10.083 10.083 10.083 0 0 0 4.9056-1.2873l0.66781 0.67138a11 11 0 0 1-5.5734 1.5326 11 11 0 0 1-11-11zm5.423-9.4673a11 11 0 0 1 5.577-1.5326 11 11 0 0 1 11 11 11 11 0 0 1-1.5326 5.577l-4.9307-4.9289 0.64811-0.64811 4.0373 4.039a10.083 10.083 0 0 0 0.86116-4.039 10.083 10.083 0 0 0-10.083-10.083 10.083 10.083 0 0 0-4.9056 1.2873z" fill="#fff" stroke-width=".91667"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 785 B

4
shutdown-ui/icons/system-shutdown.svg
Unescape Escape View File

@ -1,8 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#dedede;
}</style>
</defs>
<path class="ColorScheme-Text" d="m15 4v0.05078 1.0039 7.9453h2v-7.9492-1.0039-0.046875h-1-1zm3 0.16992v1.0215a11 11 0 0 1 9 10.809 11 11 0 0 1-11 11 11 11 0 0 1-11-11 11 11 0 0 1 9-10.811v-1.0078a12 12 0 0 0-10 11.818 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-10-11.83z" fill="#fff"/>
<path class="ColorScheme-Text" d="m11.083 1.0002v8.25h1.8333v-8.25h-1.8333zm2.75 0.15576v0.93638a10.083 10.083 0 0 1 8.25 9.9082 10.083 10.083 0 0 1-10.083 10.083 10.083 10.083 0 0 1-10.083-10.083 10.083 10.083 0 0 1 8.25-9.9101v-0.92382a11 11 0 0 0-9.1667 10.833 11 11 0 0 0 11 11 11 11 0 0 0 11-11 11 11 0 0 0-9.1667-10.844z" fill="#fff" stroke-width=".91667"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 597 B

8
shutdown-ui/icons/system-suspend.svg
Unescape Escape View File

@ -1,9 +1,9 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#dedede;
}</style>
<g class="ColorScheme-Text" fill="#fff">
<path d="M9.762 5.762a12 12 0 0 0-.004.008A12 12 0 0 0 4 16a12 12 0 0 0 12 12 12 12 0 0 0 10.238-5.762l-.732-.732A11 11 0 0 1 20 23 11 11 0 0 1 9 12a11 11 0 0 1 1.486-5.502 11 11 0 0 1 .008-.004zM8.8 7.702A12 12 0 0 0 8 12a12 12 0 0 0 12 12 12 12 0 0 0 4.326-.82A11 11 0 0 1 16 27 11 11 0 0 1 5 16a11 11 0 0 1 3.8-8.299zM22 6v1h2.293l-2 2-.293.293V10h4V9h-2.293l2-2L26 6.707V6h-.707z"/>
<path d="M20 13v1h2.293l-2 2-.293.293V17h4v-1h-2.293l2-2 .293-.293V13h-.707zm-6-5v1h2.293l-2 2-.293.293V12h4v-1h-2.293l2-2L18 8.707V8h-.707z"/>
<g class="ColorScheme-Text" transform="matrix(.9893 0 0 .9893 -2.9572 -4.7003)" fill="#fff">
<path d="m9.762 5.762a12 12 0 0 0-4e-3 8e-3 12 12 0 0 0-5.758 10.23 12 12 0 0 0 12 12 12 12 0 0 0 10.238-5.762l-0.732-0.732a11 11 0 0 1-5.506 1.494 11 11 0 0 1-11-11 11 11 0 0 1 1.486-5.502 11 11 0 0 1 8e-3 -4e-3zm-0.962 1.94a12 12 0 0 0-0.8 4.298 12 12 0 0 0 12 12 12 12 0 0 0 4.326-0.82 11 11 0 0 1-8.326 3.82 11 11 0 0 1-11-11 11 11 0 0 1 3.8-8.299zm13.2-1.702v1h2.293l-2.293 2.293v0.707h4v-1h-2.293l2.293-2.293v-0.707h-0.707z"/>
<path d="m20 13v1h2.293l-2.293 2.293v0.707h4v-1h-2.293l2.293-2.293v-0.707h-0.707zm-6-5v1h2.293l-2.293 2.293v0.707h4v-1h-2.293l2.293-2.293v-0.707h-0.707z"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 913 B

Write Preview
Loading…
Cancel
Save