Merge branch 'c10s' into a10s

This commit is contained in:
eabdullin 2024-12-16 16:33:40 +03:00
commit dff5e29fea
4 changed files with 4 additions and 33 deletions

1
.gitignore vendored
View File

@ -232,3 +232,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-47.rc.tar.xz
/gnome-shell-47.0.tar.xz
/gnome-shell-47.1.tar.xz
/gnome-shell-47.2.tar.xz

View File

@ -1,30 +0,0 @@
From db2ac6188e3fb7ee727e9e71d5416e8f2b75f12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 7 Nov 2024 16:23:48 +0100
Subject: [PATCH] dialog: Wrap titles
Dialogs should not use titles that are too long to fit, but if
they do, wrapping is more appropriate than ellipsizing.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3540>
---
js/ui/dialog.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index 11a27a0207..361fad3cb9 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -173,6 +173,9 @@ export const MessageDialogContent = GObject.registerClass({
this._title = new St.Label({style_class: 'message-dialog-title'});
this._description = new St.Label({style_class: 'message-dialog-description'});
+ this._title.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+ this._title.clutter_text.line_wrap = true;
+
this._description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._description.clutter_text.line_wrap = true;
--
2.47.0

View File

@ -8,7 +8,7 @@
%endif
Name: gnome-shell
Version: 47.1
Version: 47.2
Release: %autorelease
Summary: Window management and application launching for GNOME
@ -42,10 +42,10 @@ Patch: 0001-main-Dump-stack-on-segfaults-by-default.patch
Patch: 0001-st-texture-cache-purge-on-resume.patch
Patch: fix-some-js-warnings.patch
Patch: 0001-data-Update-generated-stylesheets.patch
%if 0%{!?almalinux}
Patch: 0001-theme-Welcome-Illustration.patch
%endif
Patch: 0001-dialog-Wrap-titles.patch
%define eds_version 3.45.1
%define gnome_desktop_version 44.0-7

View File

@ -1 +1 @@
SHA512 (gnome-shell-47.1.tar.xz) = 451b5609f4a9a3f6acb729bb0137f1d7db7da4de956e13576402fd22c3dd7d0ba5b7cc634bf0d0923fbf0624812fb4646164bb4c0c29535acb09f30c904fd05f
SHA512 (gnome-shell-47.2.tar.xz) = 85e278f80fea53b13a030eeb2847352726810a43916889fe63e9f65b2920806e6406eb00ecc62bc8915e1f29112dc02059f5ce0e74bcbcb794be03ea191f8ef2