Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Sandro
b6ec144d26
Revert upstream switch to AdwWrapBox
This allows us to update F41 to 52.0, which fixes an annoying bug.
2025-11-08 13:45:04 +01:00
2 changed files with 73 additions and 0 deletions

View file

@ -0,0 +1,69 @@
From 66da9fdbfcd19cc9e431ba7b0f182c93b6fe741c Mon Sep 17 00:00:00 2001
From: Sandro <devel@penguinpee.nl>
Date: Sat, 8 Nov 2025 13:38:09 +0100
Subject: [PATCH] Revert "bottle-row: Port to AdwWrapBox"
WrapBox is only available in libadwaita >= 1.7. That's too new for
F41. Revert the switch to WrapBox.
This reverts commit eb81c0306ef20aa5e4c0104a0a6d55779996b027.
---
bottles/frontend/ui/bottle-row.blp | 16 ++++++++++------
bottles/frontend/views/list.py | 6 +++---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/bottles/frontend/ui/bottle-row.blp b/bottles/frontend/ui/bottle-row.blp
index 163900ea..2598ed52 100644
--- a/bottles/frontend/ui/bottle-row.blp
+++ b/bottles/frontend/ui/bottle-row.blp
@@ -5,13 +5,17 @@ template $BottlesBottleRow: Adw.ActionRow {
activatable: true;
use-markup: false;
- Adw.WrapBox wrap_box {
- valign: center;
+ Box {
+ spacing: 6;
- styles [
- "tag",
- "caption",
- ]
+ Label label_env {
+ valign: center;
+
+ styles [
+ "tag",
+ "caption",
+ ]
+ }
}
Button button_run {
diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py
index a8f6c587..91a52e2b 100644
--- a/bottles/frontend/views/list.py
+++ b/bottles/frontend/views/list.py
@@ -37,7 +37,7 @@ class BottlesBottleRow(Adw.ActionRow):
# region Widgets
button_run = Gtk.Template.Child()
- wrap_box = Gtk.Template.Child()
+ label_env = Gtk.Template.Child()
# endregion
@@ -74,8 +74,8 @@ class BottlesBottleRow(Adw.ActionRow):
self.set_title(self.config.Name)
if self.window.settings.get_boolean("update-date"):
self.set_subtitle(update_date)
-
- self.wrap_box.append(Gtk.Label.new(self.config.Environment))
+ self.label_env.set_text(_(self.config.Environment))
+ self.label_env.add_css_class("tag-%s" % self.config.Environment.lower())
# Set tooltip text
self.button_run.set_tooltip_text(_(f"Run executable in “{self.config.Name}”"))
--
2.51.0

View file

@ -29,6 +29,10 @@ Patch: 1001-Revert-meson-Add-check-for-Flatpak.patch
Patch: 1002-Change-issue-URL-to-Bugzilla.patch
Patch: 1003-Display-warning-regarding-issue-tracker.patch
Patch: 1004-Do-not-require-Xdp.patch
# Revert switch to WrapBox. F41's libadwaita does not support it.
%if 0%{fedora} <= 41
Patch: 9001-Revert-bottle-row-Port-to-AdwWrapBox.patch
%endif
BuildArch: noarch