@gjsify/adwaita-nativescript 0.64.12-next.279 → 0.64.12-next.281

package/lib/types/widgets/gtk-popover-menu.d.ts

@@ -50,6 +50,9 @@ declare const GtkPopoverMenu_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/gtk-scrolled-window.d.ts

@@ -15,6 +15,8 @@ export declare class GtkScrolledWindow extends AdwSingleChildBase {
     private _hasFrame;
     private _hadjustment;
     private _vadjustment;
+    private _listening;
+    private _syncing;
     constructor(props?: ConstructProps<GtkScrolledWindow>);
     /** `Gtk.ScrolledWindow:hscrollbar-policy` — a `Gtk.PolicyType`; defaults to `automatic`. */
     get hscrollbarPolicy(): GtkPolicyNick;
@@ -26,13 +28,21 @@ export declare class GtkScrolledWindow extends AdwSingleChildBase {
     get_policy(): [number, number];
     /** `gtk_scrolled_window_set_policy`; a value that is not a `Gtk.PolicyType` constant throws. */
     set_policy(hscrollbar_policy: number, vscrollbar_policy: number): void;
-    /** `Gtk.ScrolledWindow:hadjustment` — the one it was given, else a window-owned one. */
+    /**
+     * `Gtk.ScrolledWindow:hadjustment` — the one it was given, else a window-owned one.
+     *
+     * Observable and kept in step with the `ScrollView` both ways: the scroll offset and the
+     * content/viewport sizes are configured into it, and a write to its value scrolls.
+     */
     get hadjustment(): GtkAdjustment;
     get vadjustment(): GtkAdjustment;
     get_hadjustment(): GtkAdjustment;
     get_vadjustment(): GtkAdjustment;
     set_hadjustment(adjustment: GtkAdjustment): void;
     set_vadjustment(adjustment: GtkAdjustment): void;
+    private _track;
+    private readonly _syncAdjustments;
+    private _syncAxis;
     /** `Gtk.ScrolledWindow:has-frame` — held and read back; no frame is drawn (see the header). */
     get hasFrame(): boolean;
     set hasFrame(raw: boolean | string);

package/lib/types/widgets/gtk-stack.d.ts

@@ -57,6 +57,9 @@ declare const GtkStack_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);
@@ -120,6 +123,14 @@ export declare class GtkStack extends GtkStack_base {
     /** `Gtk.Stack:visible-child` — the visible page's child, or `null`. */
     get visibleChild(): View | null;
     set visibleChild(child: View | null);
+    /** `gtk_stack_get_visible_child_name`. */
+    get_visible_child_name(): string | null;
+    /** `gtk_stack_set_visible_child_name`. */
+    set_visible_child_name(name: string): void;
+    /** `gtk_stack_get_visible_child`. */
+    get_visible_child(): View | null;
+    /** `gtk_stack_set_visible_child`. */
+    set_visible_child(child: View): void;
     /** `Gtk.Stack:transition-type` — held and validated, never rendered. */
     get transitionType(): GtkStackTransitionNick;
     set transitionType(value: GtkStackTransitionNick);

package/lib/types/widgets/gtk-text-view.d.ts

@@ -59,6 +59,9 @@ declare const GtkTextView_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/gtk-window.d.ts

@@ -50,8 +50,9 @@ export declare class GtkWindow extends AdwSingleChildBase {
     close(): void;
     private _requestClose;
     /**
-     * What the back button does, in order: the topmost dialog, the innermost navigation view, then
-     * `close-request`. Always consumes the press — the system's own back would `finish()` too, but
+     * What the back button does, in order: the topmost dialog, an open bottom sheet, the innermost
+     * navigation view, then `close-request`. The sheet sits over the content a navigation view lives
+     * in, and libadwaita closes it on Escape before anything under it sees the key. Always consumes the press — the system's own back would `finish()` too, but
      * without asking the handlers.
      */
     private _handleBack;
@@ -69,4 +70,11 @@ export declare class GtkWindow extends AdwSingleChildBase {
     /** `GtkWindow:default-height` — held and read back; the screen is the height. */
     get defaultHeight(): number;
     set defaultHeight(value: number | string);
+    /** `gtk_window_get_default_size`: `[width, height]`, `[0, 0]` until one is set. */
+    get_default_size(): [number, number];
+    /**
+     * `gtk_window_set_default_size`: a value below -1 is refused as in GTK, an equal one does not
+     * notify, and `default-height` notifies before `default-width`.
+     */
+    set_default_size(width: number, height: number): void;
 }

package/lib/types/widgets/index.d.ts

@@ -14,8 +14,7 @@ export { AdwSpinRow, NOTIFY_VALUE, SpinState } from './adw-spin-row.js';
 export type { NotifyValueEventData, SpinStateChange, SpinStateListener } from './adw-spin-row.js';
 export { AdwSliderRow, NOTIFY_SLIDER_VALUE } from './adw-slider-row.js';
 export type { NotifySliderValueEventData } from './adw-slider-row.js';
-export { AdwExpanderRow, ExpanderState, NOTIFY_EXPANDED } from './adw-expander-row.js';
-export type { ExpanderStateListener, NotifyExpandedEventData } from './adw-expander-row.js';
+export { AdwExpanderRow, NOTIFY_EXPANDED, NOTIFY_ENABLE_EXPANSION, NOTIFY_SHOW_ENABLE_SWITCH, NS_EXPANDER_ARROW_DISABLED_OPACITY, } from './adw-expander-row.js';
 export { GtkButton, GTK_BUTTON_CLICKED, GTK_BUTTON_LABEL_CLASS } from './gtk-button.js';
 export { buttonSlotAfterWrite, buttonSlotDetaches } from './button-slot.js';
 export type { ButtonSlot, ButtonSlotWrite } from './button-slot.js';
@@ -44,6 +43,7 @@ export { revealerChildVisibility } from './revealer-state.js';
 export type { RevealerChildVisibility } from './revealer-state.js';
 export { GtkScrolledWindow } from './gtk-scrolled-window.js';
 export { GtkWindow } from './gtk-window.js';
+export { GtkApplicationWindow } from './gtk-application-window.js';
 export { DEFAULT_SCROLLBAR_POLICY, GTK_POLICY_TYPES, normalizePolicy, policyScrolls, scrollOrientationFor, } from './scrolled-window-policy.js';
 export type { GtkPolicyNick } from './scrolled-window-policy.js';
 export { GtkStack, NOTIFY_STACK_VISIBLE_CHILD, NOTIFY_STACK_VISIBLE_CHILD_NAME } from './gtk-stack.js';
@@ -85,8 +85,8 @@ export type { DataGridItemSpec } from './data-grid-model.js';
 export { AdwSpinner, DEFAULT_SPINNER_SIZE } from './adw-spinner.js';
 export { AdwStatusPage } from './adw-status-page.js';
 export { AdwButtonRow, ACTIVATED } from './adw-button-row.js';
-export { AdwButtonContent } from './adw-button-content.js';
-export { AdwSplitButton, CLICKED, MENU_TAPPED } from './adw-split-button.js';
+export { AdwButtonContent, NOTIFY_BUTTON_CONTENT_ICON_NAME, NOTIFY_BUTTON_CONTENT_LABEL, NOTIFY_BUTTON_CONTENT_USE_UNDERLINE, NOTIFY_BUTTON_CONTENT_CAN_SHRINK, } from './adw-button-content.js';
+export { AdwSplitButton, MENU_TAPPED } from './adw-split-button.js';
 export type { MenuTappedEventData } from './adw-split-button.js';
 export { AdwToggleGroup, NOTIFY_SELECTED as NOTIFY_TOGGLE_SELECTED, ToggleGroupState } from './adw-toggle-group.js';
 export { AdwToggle } from './adw-toggle.js';

package/lib/types/widgets/signals.d.ts

@@ -56,7 +56,12 @@ export interface GObjectSignals {
     connect(eventName: string, callback: (self: this, data: EventData) => unknown): number;
     /** Remove exactly the handler `connect` returned this id for. Throws on an id nothing holds. */
     disconnect(handlerId: number): void;
-    /** `g_signal_emit_by_name`: run every handler `connect` added for `eventName`, with `args` in the payload. */
+    /**
+     * `g_signal_emit_by_name`: run every handler `connect` added for `eventName`, with `args` in the
+     * payload. Valid ONLY for a signal the class declares, or `notify::<declared prop>`; any other
+     * name throws as GJS does for an unknown signal. NativeScript's own events go through
+     * `notify({ eventName, object })`.
+     */
     emit(eventName: string, ...args: unknown[]): void;
     /**
      * `g_object_get_property`: the GTK property `name` (`'can-close'` or camel case). A
@@ -136,6 +141,9 @@ export declare function withSignals<TBase extends ObservableConstructor>(Base: T
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/split-button.d.ts

@@ -1,4 +1,4 @@
-import type { AdwArrowIcon, SplitButtonDirection, SplitButtonState } from '@gjsify/adwaita-core';
+import type { AdwArrowIcon, SplitButtonDirection } from '@gjsify/adwaita-core';
 export type { SplitButtonDirection };
 /**
  * The libadwaita arrow glyph names mapped to real Adwaita symbolic SVGs. Keyed by
@@ -8,12 +8,3 @@ export type { SplitButtonDirection };
 export declare const ARROW_SVGS: Readonly<Record<AdwArrowIcon, string>>;
 /** The arrow SVG for a direction; the split button's `none` is the down caret, not a hamburger. */
 export declare function splitButtonArrowSvg(direction: SplitButtonDirection): string;
-/**
- * Apply `AdwSplitButton.iconName = svg` to the content machine. The SVG string IS
- * the icon identity on NativeScript, so it goes where GTK puts the icon NAME.
- *
- * C offers no "unset the icon", only the side effect of filling another slot, so an
- * empty SVG clears the content and lets the label half take over again — what a
- * caller assigning `iconName` from a nullable lookup expects.
- */
-export declare function setActionIcon(state: SplitButtonState, svg: string | null | undefined): void;

package/lib/types/widgets/split-view-base.d.ts

@@ -56,6 +56,9 @@ declare const AdwSplitViewBase_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/stack-page.d.ts

@@ -54,6 +54,9 @@ declare const GtkStackPage_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/style-manager.d.ts

@@ -1,11 +1,16 @@
-import { StyleManagerBase, type AdwColorScheme, type StyleSource } from '@gjsify/adwaita-core';
+import { StyleManagerBase, type AdwAccentColorName, type AdwColorScheme, type StyleSource } from '@gjsify/adwaita-core';
 /** The system's light/dark preference as a platform reports it. */
 export interface SystemAppearance {
     /** The current preference, `null` while the platform cannot tell. */
     current(): AdwColorScheme | null;
     /** Calls `changed` with each new preference; returns the unsubscribe. */
-    subscribe(changed: (scheme: AdwColorScheme) => void): () => void;
+    subscribe(changed: (scheme: AdwColorScheme | null) => void): () => void;
+    /** Whether the system asks for more contrast; absent means it cannot. */
+    highContrast?(): boolean;
+    /** The system accent snapped to one of the nine; `null` or absent when it has none. */
+    accentColor?(): AdwAccentColorName | null;
 }
+export declare function setAccentPainter(next: ((accent: AdwAccentColorName) => void) | null): void;
 /**
  * Hand the source the system's appearance (or take it away with `null`). From then on the scheme
  * follows the system while no `FORCE_*` scheme pins it, and `system_supports_color_schemes` answers

package/lib/types/widgets/styled-layout-base.d.ts

@@ -46,6 +46,9 @@ declare const AdwStyledLayoutBase_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/system-accent.d.ts

@@ -0,0 +1,22 @@
+import { type AdwAccentColorName } from '@gjsify/adwaita-core';
+/** The slice of the `android` global read here; absent off Android, so every hop is a refusal. */
+export interface AndroidGlobals {
+    os?: {
+        Build?: {
+            VERSION?: {
+                SDK_INT?: number;
+            };
+        };
+    };
+}
+export interface AndroidContext {
+    getSystemService(name: string): {
+        getContrast?(): number;
+    } | null;
+    getResources?(): {
+        getIdentifier(name: string, type: string, pkg: string): number;
+    } | null;
+    getColor?(id: number): number;
+}
+export declare function systemHighContrast(android: AndroidGlobals | undefined, context: AndroidContext | null): boolean;
+export declare function systemAccent(android: AndroidGlobals | undefined, context: AndroidContext | null): AdwAccentColorName | null;

package/lib/types/widgets/view-stack-page.d.ts

@@ -54,6 +54,9 @@ declare const AdwViewStackPage_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/view-switcher-base.d.ts

@@ -58,6 +58,9 @@ declare const AdwViewSwitcherBase_base: ((abstract new (...args: any[]) => {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    get_width(): number;
+    get_height(): number;
+    compute_point(target: object, point: import("@gjsify/adwaita-core").Point): [boolean, import("@gjsify/adwaita-core").Point];
     insert_action_group(prefix: string, group: import("@gjsify/adwaita-core").ActionGroupLike | null): void;
     get focusable(): boolean;
     set focusable(value: boolean | string);

package/lib/types/widgets/widget-layout.d.ts

@@ -1,5 +1,5 @@
 import type { Observable } from '@nativescript/core';
-import type { ActionGroupLike } from '@gjsify/adwaita-core';
+import { Point, type ActionGroupLike } from '@gjsify/adwaita-core';
 /**
  * A constructor the mixin can wrap — the same shape `withSignals` accepts, restated here so
  * this module does not import the one that applies it.
@@ -92,6 +92,12 @@ export declare abstract class GtkWidgetLayoutMembers {
     get_next_sibling(): object | null;
     get_prev_sibling(): object | null;
     get_parent(): object | null;
+    /** `gtk_widget_get_width`: the allocated width in DIPs; 0 until a layout pass ran. */
+    get_width(): number;
+    /** `gtk_widget_get_height`: the allocated height in DIPs; 0 until a layout pass ran. */
+    get_height(): number;
+    /** `gtk_widget_compute_point`: `[false, (0, 0)]` when the two views share no tree. */
+    compute_point(target: object, point: Point): [boolean, Point];
     /** `gtk_widget_insert_action_group`: `null` removes the group of `prefix`. */
     insert_action_group(prefix: string, group: ActionGroupLike | null): void;
     get focusable(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/adwaita-nativescript",
-    "version": "0.64.12-next.279",
+    "version": "0.64.12-next.281",
     "description": "Native Adwaita widgets for the NativeScript runtime — real NativeScript components (StackLayout/GridLayout/Switch/Label) styled like Libadwaita, not a webview",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -73,15 +73,15 @@
         "design-system"
     ],
     "dependencies": {
-        "@gjsify/adwaita-core": "0.64.12-next.279",
-        "@gjsify/adwaita-fonts": "0.64.12-next.279",
-        "@gjsify/adwaita-icons": "0.64.12-next.279",
-        "@gjsify/canvas2d-core": "0.64.12-next.279",
-        "@gjsify/native-platform": "0.64.12-next.279"
+        "@gjsify/adwaita-core": "0.64.12-next.281",
+        "@gjsify/adwaita-fonts": "0.64.12-next.281",
+        "@gjsify/adwaita-icons": "0.64.12-next.281",
+        "@gjsify/canvas2d-core": "0.64.12-next.281",
+        "@gjsify/native-platform": "0.64.12-next.281"
     },
     "peerDependencies": {
         "@nativescript/core": "*",
-        "@gjsify/app-settings": "0.64.12-next.279"
+        "@gjsify/app-settings": "0.64.12-next.281"
     },
     "peerDependenciesMeta": {
         "@nativescript/core": {
@@ -92,11 +92,11 @@
         }
     },
     "devDependencies": {
-        "@gjsify/app-settings": "0.64.12-next.279",
-        "@gjsify/blueprint": "0.64.12-next.279",
-        "@gjsify/cli": "0.64.12-next.279",
-        "@gjsify/unit": "0.64.12-next.279",
-        "@gjsify/vite-plugin-blueprint": "0.64.12-next.279",
+        "@gjsify/app-settings": "0.64.12-next.281",
+        "@gjsify/blueprint": "0.64.12-next.281",
+        "@gjsify/cli": "0.64.12-next.281",
+        "@gjsify/unit": "0.64.12-next.281",
+        "@gjsify/vite-plugin-blueprint": "0.64.12-next.281",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -126,5 +126,5 @@
         "url": "https://github.com/gjsify/gjsify/issues"
     },
     "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/nativescript-bridge/adwaita#readme",
-    "gitHead": "e9026ad9f11b386102628e9e6fb93cb8b6cbd5ee"
+    "gitHead": "c4d2e266c0d9849860b9828c14ebfe37b6d493b8"
 }

package/src/testing/ns-core.mts

@@ -532,6 +532,10 @@ export class LayoutBase extends View {
         return this.#children[index];
     }
 
+    getChildIndex(child: View): number {
+        return this.#children.indexOf(child);
+    }
+
     getChildrenCount(): number {
         return this.#children.length;
     }
@@ -738,21 +742,6 @@ export class Button extends View {
     text = '';
 }
 
-export class ScrollView extends View {
-    orientation: 'horizontal' | 'vertical' = 'vertical';
-    content: View = null;
-    readonly horizontalOffset: number = 0;
-    readonly verticalOffset: number = 0;
-
-    scrollToHorizontalOffset(_value: number, _animated: boolean): void {}
-
-    scrollToVerticalOffset(_value: number, _animated: boolean): void {}
-
-    eachChildView(callback: (child: View) => boolean): void {
-        if (this.content) callback(this.content);
-    }
-}
-
 /**
  * Upstream's `content` setter (`ui/content-view/index.ts`) `_removeView`s the old view and
  * `_addView`s the new one, and `eachChildView` answers that one view — so the tree members see
@@ -789,6 +778,23 @@ export class ContentView extends LayoutBase {
     }
 }
 
+/** Upstream's `ScrollView` is a `ContentView`: its content is `_addView`ed, so it has the scroller as its parent. */
+export class ScrollView extends ContentView {
+    orientation: 'horizontal' | 'vertical' = 'vertical';
+    horizontalOffset: number = 0;
+    verticalOffset: number = 0;
+
+    scrollToHorizontalOffset(value: number, _animated: boolean): void {
+        this.horizontalOffset = value;
+        this.notify({ eventName: 'scroll', object: this, scrollX: value, scrollY: this.verticalOffset });
+    }
+
+    scrollToVerticalOffset(value: number, _animated: boolean): void {
+        this.verticalOffset = value;
+        this.notify({ eventName: 'scroll', object: this, scrollX: this.horizontalOffset, scrollY: value });
+    }
+}
+
 export class WrapLayout extends LayoutBase {
     orientation: 'horizontal' | 'vertical' = 'horizontal';
     itemWidth = 0;

package/src/theme/adwaita.css

@@ -469,15 +469,36 @@ Page.adw-window {
  * a 32 tap target it never got. `color` and `font-size` were dead for the other
  * reason: it is an `Image` of a pre-coloured bitmap.
  *
- * The tap target is a separate matter, filed as #1155 — libadwaita toggles from
- * the HEADER ROW ("must be activatable to toggle expansion by clicking or
- * tapping anywhere on it", adw-expander-row.ui:25-27), and this port listens on
- * the chevron alone. */
+ * The tap target is NOT this rule's business either (#1155): the row listens on the
+ * title/subtitle stack as well as the chevron, which is how libadwaita's activatable
+ * header row reads ("tapping anywhere on it", adw-expander-row.ui:25-27). The
+ * chevron's own 16 is upstream's minimum and stays it.
+ *
+ * `opacity` here is the RESTING 70%; the chevron's second opacity — the disabled
+ * 50% of `sensitive` — is assigned by the widget, because the NS CSS subset has no
+ * widget states to select on (`NS_EXPANDER_ARROW_DISABLED_OPACITY`). NS multiplies
+ * neither: a local `opacity` write wins over this one outright. */
 .adw-expander-toggle {
     opacity: 0.7;
     margin: 0;
 }
 
+/* The trailing cluster, in the `.ui`'s order: the suffixes box, the enable switch,
+ * the chevron. `> .suffixes { border-spacing: 6px }` (_lists.scss:155-161) is the 6
+ * between them — a `StackLayout` has no spacing, so it is a leading margin on each
+ * part instead. The suffixes BOX carries none of its own: it collapses while empty
+ * (`adw_expander_row_add_suffix` is what makes it visible), and a margin on a
+ * collapsed view would still be a gap. */
+.adw-expander-row-cluster {
+    vertical-align: center;
+}
+
+.adw-expander-row-cluster .adw-switch,
+.adw-expander-row-cluster .adw-expander-toggle,
+.adw-expander-row-suffixes .adw-row-suffix {
+    margin: 0 0 0 6;
+}
+
 .adw-expander-disclosure {
     background-color: #fafafb;
     margin: 8 0 0 0;