forked from Blendman974/faceclaw
[verified] merge upstream c162c8e6 into all-features
This commit is contained in:
commit
5790e98d27
176 files changed
+5311
-2307
No files matched your search
@@ -4,7 +4,7 @@ import { GrayImage } from "../../graphics/image";
|
||||
import { type Plane } from "../../graphics/plane";
|
||||
import { renderIcon, type IconName } from "../../graphics/icons";
|
||||
import { InputEvent } from "../../ui/gestures";
|
||||
import { IconGrid, ICON_GRID_BAND_INSET_X, ICON_GRID_HIGHLIGHT_INSET_Y, ICON_GRID_ICON_SIZE } from "../../ui/icon-grid";
|
||||
import { IconGrid, ICON_GRID_ICON_SIZE } from "../../ui/icon-grid";
|
||||
import { Layer, LayerActions, LayerContext } from "../../ui/layers";
|
||||
import { MenuLayer, type MenuItem } from "../../ui/menu";
|
||||
import { WINDOW_MENU_LAYOUT } from "../../ui/window-menu";
|
||||
@@ -48,12 +48,9 @@ export type LauncherOptions = {
|
||||
export const LAUNCHER_WINDOW_ID = "launcher";
|
||||
export const LAUNCHER_SURFACE_ID = "window:launcher";
|
||||
|
||||
const GRID_TOP = 6;
|
||||
/**
|
||||
* The root grid's top: its first row's highlight band then sits as far
|
||||
* below the window's top edge as it is from the side edges.
|
||||
*/
|
||||
const ROOT_GRID_TOP = ICON_GRID_BAND_INSET_X - ICON_GRID_HIGHLIGHT_INSET_Y;
|
||||
/** A folder's name, above its grid: how far in from the grid's side, and the gap under it. */
|
||||
const FOLDER_NAME_INSET_X = 4;
|
||||
const FOLDER_NAME_GAP = 6;
|
||||
|
||||
/** One cell of the grid: an app, or a folder holding some of the apps. */
|
||||
type LauncherGridEntry =
|
||||
@@ -362,24 +359,32 @@ class LauncherGridLayer implements Layer {
|
||||
|
||||
paint(ctx: LayerContext): GrayImage {
|
||||
const font = getDefaultSmallFont();
|
||||
const { width, height } = ctx.stack.getBaseSize();
|
||||
const { width, height, padding } = ctx.stack.getBaseSize();
|
||||
const image = new GrayImage(width, height, 0);
|
||||
// The folder-name header band scales with the font.
|
||||
const entries = this.entries();
|
||||
if (this.moving && (launcherLayoutSetting.get() !== "custom" || this.moving.folder !== this.currentFolder ||
|
||||
!entries.some(entry => entryKey(entry) === this.moving!.key))) this.moving = null;
|
||||
const gridTop = this.moving ? GRID_TOP + 2 * (font.lineHeight + 2)
|
||||
: this.currentFolder !== null ? GRID_TOP + font.lineHeight + 4 : ROOT_GRID_TOP;
|
||||
const gridX = padding.left;
|
||||
const gridWidth = width - padding.left - padding.right;
|
||||
// Scrolling rows reach the window edges, with the suggested padding
|
||||
// inside the grid. Folder and move headers stay fixed above it.
|
||||
let gridTop = 0;
|
||||
let padTop = padding.top;
|
||||
const nameX = gridX + FOLDER_NAME_INSET_X;
|
||||
const nameWidth = gridWidth - 2 * FOLDER_NAME_INSET_X;
|
||||
if (this.moving) {
|
||||
image.drawText(font, 8, GRID_TOP - 2, truncateText(font, `Move ${this.moving.label}`, width - 16), 220);
|
||||
image.drawText(font, 8, GRID_TOP + font.lineHeight, "Select position; double tap cancels", 160);
|
||||
image.drawText(font, nameX, padding.top, truncateText(font, `Move ${this.moving.label}`, nameWidth), 220);
|
||||
image.drawText(font, nameX, padding.top + font.lineHeight + 2,
|
||||
truncateText(font, "Select position; double tap cancels", nameWidth), 160);
|
||||
gridTop = padding.top + 2 * (font.lineHeight + 2) + FOLDER_NAME_GAP;
|
||||
padTop = 0;
|
||||
} else if (this.currentFolder !== null) {
|
||||
image.drawText(font, nameX, padding.top, truncateText(font, this.currentFolder, nameWidth), 160);
|
||||
gridTop = padding.top + font.lineHeight + FOLDER_NAME_GAP;
|
||||
padTop = 0;
|
||||
}
|
||||
if (this.currentFolder !== null && !this.moving) {
|
||||
image.drawText(font, 8, GRID_TOP - 2, truncateText(font, this.currentFolder, width - 16), 160);
|
||||
}
|
||||
// The grid runs to the window's bottom edge, so a row cut off there for
|
||||
// scrolling meets the window's border rather than a blank strip.
|
||||
this.grid.paint(image, { x: 0, y: gridTop, width, height: height - gridTop }, ctx.stack.isFocused());
|
||||
this.grid.paint(image, { x: gridX, y: gridTop, width: gridWidth, height: height - gridTop, padTop, padBottom: padding.bottom },
|
||||
ctx.stack.isFocused());
|
||||
return image;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user