Commit 18cd24e6 authored by Sebastian Keller's avatar Sebastian Keller Committed by Marge Bot

appDisplay: Fix app folder icon subicon spacing

The code previously was using CSS to define row/column spacing and
padding which was combined with a subicon size computed in code relative
to the requested icon size.

In smaller icon sizes it was possible for the CSS spacing+padding + the
size of the two subicons to exceed the requested icon size. This then
would lead to the label being pushed down for app folders compared to
other icons.

Another more severe issue caused by this would happen if the first item
in an icon grid was an app folder. Then the calculation for the maximum
allowed icon size could be off, leading to all icons in the grid
becoming smaller than actually necessary.

This commit changes this to use homogeneous row and column layouts to
evenly distribute the remaining spacing instead of using a fixed CSS

Fixes #3069

Part-of: <!1581>
parent 8c792969
Pipeline #249160 passed with stages
in 7 minutes and 12 seconds
......@@ -89,13 +89,6 @@ $app_grid_fg_color: #fff;
height: 620px;
.app-folder-icon {
padding: $base_padding;
spacing-rows: $base_spacing;
spacing-columns: $base_spacing;
// Running app indicator (also shown in dash)
.app-well-app-running-dot {
height: 5px;
......@@ -1830,13 +1830,16 @@ class FolderView extends BaseAppView {
createFolderIcon(size) {
let layout = new Clutter.GridLayout();
const layout = new Clutter.GridLayout({
row_homogeneous: true,
column_homogeneous: true,
let icon = new St.Widget({
layout_manager: layout,
style_class: 'app-folder-icon',
x_align: Clutter.ActorAlign.CENTER,
style: 'width: %dpx; height: %dpx;'.format(size, size),
let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
let numItems = this._orderedItems.length;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment