GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Volker Krause authored May 12, 2022 and Alexander Lohnau committed May 20, 2022

This builds now with one exception, the use of the deprecated
Plasma::Applet ctor.

Task: https://phabricator.kde.org/T15468

GIT_SILENT

GIT_SILENT

Wrapping such lists around does not always make sense, for example, when
pressing and holding down an arrow key. The expected behavior is to stop
at bounds instead of endlessly running around in circles, while leaving
the possibility to wrap by pressing down the directional key one more time.

This is the approach that OS X used for their application switching OSD
as well as for many other stuff. I expect to see this kind of wrapping
behavior more and more throughout Plasma, including our own Plasma/KWin
Task Switchers like "Large Icons", which is why the wrappingAdd function
here is implemented as a generic QML method ready to be factored out as
a library function.

It didn't help me fix any bug but it makes sense to me to have it
nevertheless.

It would be placed right by the unrotated geometry and after rotating it
the new output would end up floating in the logical space.
This happened because the explicitLogicalSize is cached and needs
updating after changing its settings.

It always chose the last one, and not the highest one

BUG: 453392

Even though "43:18" or "683:384" are technically correct it's way
more common to see "21:9" and "16:9", so let's display the more
usual aspect ratios to the user.

BUG: 443764

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 442549

No need to hide individual items anymore; we can just hide the whole
thing to save a few lines of code and an id.

Sorry about that.

Right now we don't explain what this does, so users are free to guess
what it does and create their own expectations, most of which will not
be met and cause dissatisfaction and bug reports. So let's clearly
explain what it does.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This is the correct signal to bind to, rather than onClicked.

GIT_SILENT

The two member variables show the beginning of reinventing this.
Makes state managment a bit easier and more straightforward to extent
in the future should it gain new settings that it manages.

qmlRegisterType is deprected. The type is never named from Qml.

This reverts commit ace23390.

The thing this was working around was fixed in
systemsettings@1022d0b0,
so we don't need it anymore.

On Wayland is the compositor itself that keeps the touchscreen coordinates mapped to the size and position of the internal screen, also keeping rotation into account.
on X11, needs to be done via XInput, do it when KScreen actually applies a configuration.

BUG: 415683

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Marek Beleščiak authored Feb 21, 2022 and Nate Graham committed Feb 21, 2022

When display output was disabled, Output::currentMode() returned
a null pointer and used it shortly afterwards.

BUG: 450265
FIXED-IN: 5.24.2

Xuetian Weng authored Feb 14, 2022 and Nate Graham committed Feb 14, 2022

A better long-term fix is being discussed in
#4.

BUG: 449560
FIXED-IN: 5.24.1