ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #488: Fix brightness settings

Browse Source
This commit is contained in:
Jenkins nymea 2020-12-23 21:12:19 +01:00
commit 5467e6b68c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nymea-app/platformintegration/generic/screenhelper.cpp
View File

@ -59,7 +59,7 @@ ScreenHelper::ScreenHelper(QObject *parent) : QObject(parent)
continue; continue;
} }
bool ok; bool ok;
m_maxBrightness = maxBrightnessFile.readAll().toInt(&ok); m_maxBrightness = maxBrightnessFile.readLine().trimmed().toInt(&ok);
if (!ok) { if (!ok) {
qWarning() << "Error reading max brightness value from" << maxBrightnessFile.fileName(); qWarning() << "Error reading max brightness value from" << maxBrightnessFile.fileName();
m_maxBrightness = -1; m_maxBrightness = -1;
@ -75,9 +75,10 @@ ScreenHelper::ScreenHelper(QObject *parent) : QObject(parent)
} }
qDebug() << "Backlight control enabled on" << m_powerFile.fileName(); qDebug() << "Backlight control enabled on" << m_powerFile.fileName();
QByteArray currentBrightness = m_brightnessFile.readLine(); bool ok;
m_currentBrightness = currentBrightness.trimmed().toInt() * 100 / m_maxBrightness; int currentBrightness = m_brightnessFile.readLine().trimmed().toInt(&ok);
qDebug() << "Current brightness is: Absolute:" << currentBrightness << "Percentage:" << m_currentBrightness; m_currentBrightness = currentBrightness * 100 / m_maxBrightness;
qDebug().nospace() << "Brigness: Absolute: " << currentBrightness << "/" << m_maxBrightness << " Percentage:" << m_currentBrightness;
screenOn(); screenOn();
@ -128,7 +129,7 @@ int ScreenHelper::screenBrightness() const
void ScreenHelper::setScreenBrightness(int percent) void ScreenHelper::setScreenBrightness(int percent)
{ {
m_currentBrightness = percent; m_currentBrightness = percent;
m_brightnessFile.write(QString("%1\n").arg(percent * 255 / 100).toUtf8()); m_brightnessFile.write(QString("%1\n").arg(percent * m_maxBrightness / 100).toUtf8());
m_brightnessFile.flush(); m_brightnessFile.flush();
} }

2
nymea-app/ui/MainMenu.qml
View File

@ -61,6 +61,8 @@ Drawer {
ProgressButton { ProgressButton {
longpressEnabled: false longpressEnabled: false
imageSource: "../images/close.svg" imageSource: "../images/close.svg"
// When we're connected via command line arg, don't allow disconnecting
visible: autoConnectHost.length === 0
onClicked: { onClicked: {
root.currentEngine.jsonRpcClient.disconnectFromHost(); root.currentEngine.jsonRpcClient.disconnectFromHost();
root.close(); root.close();