[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/phosh][upstream/latest] 5 commits: app-grid-folder-button: Force pixel size of 24px

[Guido Günther (@agx)]

Guido Günther pushed to branch upstream/latest at Debian On Mobile / phosh


Commits:
9d8a8c59 by Arun Mani J at 2024-06-26T22:34:26+05:30
app-grid-folder-button: Force pixel size of 24px

Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1081
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1465>

- - - - -
11dc1634 by Marge Bot at 2024-06-28T16:49:59+00:00
Merge branch 'folder-icon-size' into 'main'

app-grid-folder-button: Force pixel size of 24px

Closes #1081

See merge request World/Phosh/phosh!1465
- - - - -
d5d379d6 by Guido Günther at 2024-06-30T07:35:52+02:00
treewide: Document changes and release 0.40.0

Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1466>

- - - - -
afef4176 by Marge Bot at 2024-06-30T06:13:35+00:00
Merge branch 'rel-0.40.0' into 'main'

treewide: Document changes and release 0.40.0

See merge request World/Phosh/phosh!1466
- - - - -
22514545 by Guido Günther at 2024-06-30T09:38:00+02:00
New upstream version 0.40.0
- - - - -


4 changed files:

- NEWS
- debian/changelog
- meson.build
- src/app-grid-folder-button.c


Changes:

=====================================
NEWS
=====================================
@@ -1,5 +1,5 @@
-phosh 0.40.0~rc1
-----------------
+phosh 0.40.0
+------------
 Released June 2024
 * New quick setting plugins:
     * Dark style toggle
@@ -10,7 +10,7 @@ Released June 2024
     * Wire up screenshot keybinding
     * Tweak multiple gsetting overrides (default idle-delay, unlock
        sim, sound theme, …)
-    * Fix too large icons in folder buttons
+    * Fix too large and too small icons in folder buttons
     * launcher-box: Properly align count and progress to not look out
       of place
     * Move launched processes to transient scope


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-phosh (0.40.0~rc1) experimental; urgency=medium
+phosh (0.40.0) experimental; urgency=medium
 
   [ Guido Günther ]
   * build: Install headers and shared lib for Rust binding generation.
@@ -236,6 +236,8 @@ phosh (0.40.0~rc1) experimental; urgency=medium
   [ Arun Mani J ]
   * app-grid-folder-button: Force 16px as icon size.
     Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1072
+  * app-grid-folder-button: Force pixel size of 24px.
+    Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1081
 
   [ Yosef Or Boczko ]
   * Update Hebrew translation


=====================================
meson.build
=====================================
@@ -1,5 +1,5 @@
 project('phosh', 'c',
-          version: '0.40.0.rc1',
+          version: '0.40.0',
           license: 'GPL-3.0-or-later',
     meson_version: '>= 1.0.0',
   default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],


=====================================
src/app-grid-folder-button.c
=====================================
@@ -107,16 +107,20 @@ build_2x2_grid_icon (PhoshAppGridFolderButton *self)
 
     if (icon == NULL) {
       image = gtk_image_new_from_icon_name (PHOSH_APP_UNKNOWN_ICON,
-                                            GTK_ICON_SIZE_BUTTON);
+                                            GTK_ICON_SIZE_DND);
     } else {
       if (G_IS_THEMED_ICON (icon)) {
         g_themed_icon_append_name (G_THEMED_ICON (icon),
                                    PHOSH_APP_UNKNOWN_ICON);
       }
-      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DND);
     }
 
-    gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
+    /* app-grid-button uses 64px for its icon.
+     * Our grid has two rows and two columns, with 8px for spacing.
+     * So 2x + 8 = 64.
+     * It means x = 28. But we use 24 as icons usually have a 2px padding. */
+    gtk_image_set_pixel_size (GTK_IMAGE (image), 24);
     gtk_widget_set_visible (image, TRUE);
     gtk_grid_attach (self->grid, image, i % 2, i >= 2, 1, 1);
   }



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/2fac4984251499b6d6458330608506b8e023ebf5...22514545a7478dc46c02a9527ea76fe5c6b08f27

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/2fac4984251499b6d6458330608506b8e023ebf5...22514545a7478dc46c02a9527ea76fe5c6b08f27
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20240630/0bd1c8fe/attachment-0001.htm>