From 4f7b3b21e97b99b372b43b314888d42be5f995f9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 8 Nov 2024 08:50:49 +0000
Subject: x11-themes/redcore-theme-sddm : fix overlapping users
---
.../x11-themes/redcore-theme-sddm-1.314.1337-r2 | 7 ---
.../x11-themes/redcore-theme-sddm-1.314.1337-r3 | 7 +++
metadata/pkg_desc_index | 2 +-
.../files/redcore/Components/UserList.qml | 2 +-
.../files/redcore/Components/UserPanel.qml | 6 +--
.../redcore-theme-sddm/files/redcore/Main.qml | 55 +++++++++++++++------
.../redcore-theme-sddm/files/redcore/preview.png | Bin 12966612 -> 2680258 bytes
.../redcore-theme-sddm-1.314.1337-r2.ebuild | 22 ---------
.../redcore-theme-sddm-1.314.1337-r3.ebuild | 22 +++++++++
9 files changed, 75 insertions(+), 48 deletions(-)
delete mode 100644 metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r2
create mode 100644 metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r3
delete mode 100644 x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r2.ebuild
create mode 100644 x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r3.ebuild
diff --git a/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r2 b/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r2
deleted file mode 100644
index 23cd2b8f..00000000
--- a/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Redcore Linux SDDM Theme
-EAPI=7
-KEYWORDS=amd64 x86
-LICENSE=CC-BY-SA
-SLOT=0
-_md5_=481c083633b8b8326bdca26b91662515
diff --git a/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r3 b/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r3
new file mode 100644
index 00000000..23cd2b8f
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/redcore-theme-sddm-1.314.1337-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install
+DESCRIPTION=Redcore Linux SDDM Theme
+EAPI=7
+KEYWORDS=amd64 x86
+LICENSE=CC-BY-SA
+SLOT=0
+_md5_=481c083633b8b8326bdca26b91662515
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index fb6ef63b..4f7cf75c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -97,5 +97,5 @@ x11-themes/redcore-artwork-core 1.314.1337-r1: Offical Redcore Linux Core Artwor
x11-themes/redcore-artwork-grub 1.314.1337-r1: Redcore Linux GRUB2 Images
x11-themes/redcore-theme 1.314.1337-r1: Official Redcore Linux GTK theme
x11-themes/redcore-theme-lxqt 1.314.1337: Official Redcore Linux LXQT theme
-x11-themes/redcore-theme-sddm 1.314.1337-r2: Redcore Linux SDDM Theme
+x11-themes/redcore-theme-sddm 1.314.1337-r3: Redcore Linux SDDM Theme
x11-wm/qtile-meta 1-r7: Meta ebuild for Qtile, a hackable tiling window manager written in Python
diff --git a/x11-themes/redcore-theme-sddm/files/redcore/Components/UserList.qml b/x11-themes/redcore-theme-sddm/files/redcore/Components/UserList.qml
index d5437224..22241310 100644
--- a/x11-themes/redcore-theme-sddm/files/redcore/Components/UserList.qml
+++ b/x11-themes/redcore-theme-sddm/files/redcore/Components/UserList.qml
@@ -63,7 +63,7 @@ Rectangle {
if (icon.status == Image.Error)
icon.source = "../user-192.png"
else
- "/var/lib/AccountsService/icons/" + name
+ icon.source = "../user-192.png"
}
x: 12
diff --git a/x11-themes/redcore-theme-sddm/files/redcore/Components/UserPanel.qml b/x11-themes/redcore-theme-sddm/files/redcore/Components/UserPanel.qml
index 24ca7bb0..0b3a5643 100644
--- a/x11-themes/redcore-theme-sddm/files/redcore/Components/UserPanel.qml
+++ b/x11-themes/redcore-theme-sddm/files/redcore/Components/UserPanel.qml
@@ -43,8 +43,8 @@ FocusScope {
Image {
id: icon
- width: 192
- height: 192
+ width: 128
+ height: 128
smooth: true
visible: false
@@ -52,7 +52,7 @@ FocusScope {
if (icon.status == Image.Error)
icon.source = "../user-192.png"
else
- "/var/lib/AccountsService/icons/" + name
+ icon.source = "../user-192.png"
}
x: -(icon.width / 2)
diff --git a/x11-themes/redcore-theme-sddm/files/redcore/Main.qml b/x11-themes/redcore-theme-sddm/files/redcore/Main.qml
index 7f2387d9..a850fc51 100644
--- a/x11-themes/redcore-theme-sddm/files/redcore/Main.qml
+++ b/x11-themes/redcore-theme-sddm/files/redcore/Main.qml
@@ -67,7 +67,7 @@ Item {
FontLoader {
id: localsys
- source: "/usr/local/share/fonts/s/SegMDL2.ttf"
+ source: Qt.resolvedUrl("fonts/SegMDL2.ttf")
}
Text {
@@ -393,7 +393,7 @@ Item {
UserList {
id: userList
name: (model.realName === "") ? model.name : model.realName
- icon: "/var/lib/AccountsService/icons/" + name
+ icon: "../user-192.png"
anchors {
horizontalCenter: parent.horizontalCenter
@@ -412,7 +412,7 @@ Item {
}
Rectangle {
- width: 150
+ width: 255
height: listView2.count > 17 ? Screen.height - 68 : 58 * listView2.count
color: "transparent"
clip: true
@@ -486,13 +486,32 @@ Item {
Item {
- Component {
- id: userDelegate
-
- UserPanel {
- anchors.centerIn: parent
- name: (model.realName === "") ? model.name : model.realName
- icon: "/var/lib/AccountsService/icons/" + name
+ Component {
+ id: userDelegate
+
+ Item {
+ width: parent.width
+ height: selected ? 100 : 70
+ anchors.horizontalCenter: parent.horizontalCenter
+ property bool selected: ListView.isCurrentItem
+
+ Rectangle {
+ width: parent.width
+ height: parent.height
+ color: selected ? "#ffffff10" : "transparent"
+
+ UserPanel {
+ anchors.centerIn: parent
+ name: (model.realName === "") ? model.name : model.realName
+ icon: "../user-192.png"
+ }
+
+ Rectangle {
+ anchors.fill: parent
+ color: selected ? "#00ff00" : "transparent"
+ z: -1
+ }
+ }
}
}
@@ -503,22 +522,30 @@ Item {
visible: false
}
- ListView {
+ ListView {
id: listView
focus: true
model: userModel
delegate: userDelegate
currentIndex: userModel.lastIndex
interactive: false
+ orientation: ListView.Vertical
+ spacing: 5
+
+ onCurrentIndexChanged: {
+ if (listView.currentItem) {
+ listView.currentItem.selected = true;
+ }
+ }
anchors {
left: prevUser.right
right: nextUser.left
}
- }
+ }
- Button {
- id: nextUser
+ Button {
+ id: nextUser
anchors.right: parent.right
enabled: false
visible: false
diff --git a/x11-themes/redcore-theme-sddm/files/redcore/preview.png b/x11-themes/redcore-theme-sddm/files/redcore/preview.png
index 196752c8..0632e710 100644
Binary files a/x11-themes/redcore-theme-sddm/files/redcore/preview.png and b/x11-themes/redcore-theme-sddm/files/redcore/preview.png differ
diff --git a/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r2.ebuild b/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r2.ebuild
deleted file mode 100644
index 9a657795..00000000
--- a/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Redcore Linux SDDM Theme"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="CC-BY-SA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${FILESDIR}"
-
-src_install() {
- dodir usr/share/sddm/themes
- insinto usr/share/sddm/themes
- doins -r ${S}/*
-}
diff --git a/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r3.ebuild b/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r3.ebuild
new file mode 100644
index 00000000..9a657795
--- /dev/null
+++ b/x11-themes/redcore-theme-sddm/redcore-theme-sddm-1.314.1337-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+DESCRIPTION="Redcore Linux SDDM Theme"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="CC-BY-SA"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${FILESDIR}"
+
+src_install() {
+ dodir usr/share/sddm/themes
+ insinto usr/share/sddm/themes
+ doins -r ${S}/*
+}
--
cgit v1.2.3