Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 02b1f2a2dee9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 045384ac98ce
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 3, 2020

  1. kscreen: Fix #82141 

    https://bugs.kde.org/show_bug.cgi?id=417316
    @edolstra
    edolstra committed Apr 3, 2020
    Copy the full SHA
    18539b1 View commit details

Commits on Apr 4, 2020

  1. Merge pull request #84194 from edolstra/kscreen-fix 

    kscreen: Fix #82141
    @ttuegel
    ttuegel authored Apr 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    045384a View commit details
Showing with 77 additions and 0 deletions.
  1. +76 −0 pkgs/desktops/plasma-5/kscreen-417316.patch
  2. +1 −0 pkgs/desktops/plasma-5/kscreen.nix
76 changes: 76 additions & 0 deletions pkgs/desktops/plasma-5/kscreen-417316.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff
https://bugs.kde.org/show_bug.cgi?id=417316

diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200
@@ -24,8 +24,8 @@
KCM.SimpleKCM {
id: root

- implicitWidth: units.gridUnit * 30
- implicitHeight: units.gridUnit * 38
+ implicitWidth: Kirigami.Units.gridUnit * 32
+ implicitHeight: Kirigami.Units.gridUnit * 38

property int selectedOutput: 0

@@ -113,7 +113,7 @@
id: screen

Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
Layout.topMargin: Kirigami.Units.smallSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2

diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200
@@ -19,6 +19,7 @@
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 as Controls
import QtGraphicalEffects 1.0
+import org.kde.kirigami 2.4 as Kirigami

Rectangle {
id: output
@@ -77,7 +78,7 @@

Controls.Label {
Layout.fillWidth: true
- Layout.margins: units.smallSpacing
+ Layout.margins: Kirigami.Units.smallSpacing

text: model.display
wrapMode: Text.Wrap
@@ -87,7 +88,7 @@

Controls.Label {
Layout.fillWidth: true
- Layout.bottomMargin: units.smallSpacing
+ Layout.bottomMargin: Kirigami.Units.smallSpacing

text: "(" + model.size.width + "x" + model.size.height + ")"
horizontalAlignment: Text.AlignHCenter
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200
@@ -45,7 +45,7 @@
property int xOffset: (width - totalSize.width / relativeFactor) / 2;
property int yOffset: (height - totalSize.height / relativeFactor) / 2;

- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)

Component.onCompleted: background.visible = true;

@@ -54,7 +54,7 @@
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
- margins: units.smallSpacing
+ margins: Kirigami.Units.smallSpacing
}
spacing: units.smallSpacing
Controls.Button {
1 change: 1 addition & 0 deletions pkgs/desktops/plasma-5/kscreen.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@

mkDerivation {
name = "kscreen";
patches = [ ./kscreen-417316.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n