marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

initialstart/prepare: Gracefully handle kscreen late start and null

Browse source 
checks

Handle situations where the GetConfigOperation never succeeds (really early start
of initialstart) with callbacks so users can still set the scale. Also
guard more aggressively against nullptr
This commit is contained in:
Devin Lin 2025-11-25 11:17:54 -05:00
parent cd315ee8bb
commit f0dd24e8bd
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
initialstart/modules/prepare/prepareutil.cpp
View file

@ -16,18 +16,30 @@ PrepareUtil::PrepareUtil(QObject *parent)
: QObject{parent}
, m_colorsSettings{new ColorsSettings(this)}
{
connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished, this, [this](auto *op) {
initKScreen([]() { });
// set property initially
m_usingDarkTheme = m_colorsSettings->colorScheme() == "BreezeDark";
}
void PrepareUtil::initKScreen(std::function<void()> callback)
{
connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished, this, [this, callback](auto *op) {
m_config = qobject_cast<KScreen::GetConfigOperation *>(op)->config();
if (!m_config) {
return;
}
KScreen::ConfigMonitor::instance()->addConfig(m_config);
int scaling = 100;
// to determine the scaling value:
// try to take the primary display's scaling, otherwise use the scaling of any of the displays
// To determine the scaling value:
// Try to take the primary display's scaling, otherwise use the scaling of any of the displays
for (KScreen::OutputPtr output : m_config->outputs()) {
if (!output) {
continue;
}
scaling = output->scale() * 100;
m_output = output->id();
if (output->isPrimary()) {
@ -37,10 +49,9 @@ PrepareUtil::PrepareUtil(QObject *parent)
m_scaling = scaling;
Q_EMIT scalingChanged();
});
// set property initially
m_usingDarkTheme = m_colorsSettings->colorScheme() == "BreezeDark";
callback();
});
}
int PrepareUtil::scaling() const
@ -51,13 +62,24 @@ int PrepareUtil::scaling() const
void PrepareUtil::setScaling(int scaling)
{
if (!m_config) {
initKScreen([this, scaling]() {
setScalingInternal(scaling);
});
return;
}
setScalingInternal(scaling);
}
void PrepareUtil::setScalingInternal(int scaling)
{
const auto outputs = m_config->outputs();
qreal scalingNum = ((double)scaling) / 100;
for (KScreen::OutputPtr output : outputs) {
if (!output) {
continue;
}
if (output->id() == m_output) {
output->setScale(scalingNum);
}

3
initialstart/modules/prepare/prepareutil.h
View file

@ -33,6 +33,9 @@ Q_SIGNALS:
void usingDarkThemeChanged();
private:
void initKScreen(std::function<void()> callback);
void setScalingInternal(int scaling);
int m_scaling;
bool m_usingDarkTheme;