mirror of
https://github.com/rio-labs/rio.git
synced 2026-05-03 17:39:10 -05:00
more switcher bar fixes
This commit is contained in:
@@ -17,18 +17,6 @@ const ICON_HEIGHT: number = 1.8;
|
||||
// Whitespace between the icon and the text, if both are present
|
||||
const ICON_MARGIN: number = 0.5;
|
||||
|
||||
const TEXT_STYLE: TextStyle = {
|
||||
fontName: 'Roboto',
|
||||
fill: [0, 0, 0, 1],
|
||||
fontSize: 1,
|
||||
italic: false,
|
||||
fontWeight: 'bold',
|
||||
underlined: false,
|
||||
allCaps: false,
|
||||
};
|
||||
|
||||
const TEXT_STYLE_CSS_OPTIONS: object = textStyleToCss(TEXT_STYLE);
|
||||
|
||||
export type SwitcherBarState = ComponentState & {
|
||||
_type_: 'SwitcherBar-builtin';
|
||||
names?: string[];
|
||||
@@ -201,14 +189,8 @@ export class SwitcherBarComponent extends ComponentBase {
|
||||
|
||||
// If the marker is currently completely invisible, teleport.
|
||||
if (this.fadeTween.current === 0) {
|
||||
console.debug(
|
||||
`Teleporting to ${animatedPosition} because ${this.fadeTween.current}`
|
||||
);
|
||||
this.moveTween.teleportTo(animatedPosition);
|
||||
} else {
|
||||
console.debug(
|
||||
`Transitioning to ${animatedPosition} because ${this.fadeTween.current}`
|
||||
);
|
||||
this.moveTween.transitionTo(animatedPosition);
|
||||
}
|
||||
}
|
||||
@@ -278,8 +260,7 @@ export class SwitcherBarComponent extends ComponentBase {
|
||||
buildContent(deltaState: SwitcherBarState): HTMLElement {
|
||||
let result = document.createElement('div');
|
||||
result.classList.add('rio-switcher-bar-options');
|
||||
Object.assign(result.style, TEXT_STYLE_CSS_OPTIONS);
|
||||
result.style.removeProperty('color');
|
||||
result.style.gap = `${this.state.spacing}rem`;
|
||||
|
||||
let names = firstDefined(deltaState.names, this.state.names);
|
||||
let iconSvgSources = firstDefined(
|
||||
@@ -375,7 +356,8 @@ export class SwitcherBarComponent extends ComponentBase {
|
||||
|
||||
// Spacing
|
||||
if (deltaState.spacing !== undefined) {
|
||||
this.element.style.gap = `${deltaState.spacing}rem`;
|
||||
this.backgroundOptionsElement.style.gap = `${deltaState.spacing}rem`;
|
||||
this.markerOptionsElement.style.gap = `${deltaState.spacing}rem`;
|
||||
}
|
||||
|
||||
// If the selection has changed make sure to move the marker
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
/// While open, the content is assigned the CSS class `rio-popup-manager-open`.
|
||||
|
||||
import { pixelsPerRem } from './app';
|
||||
import { commitCss } from './utils';
|
||||
|
||||
/// Will always be on top of everything else.
|
||||
export class PopupManager {
|
||||
|
||||
@@ -2308,6 +2308,8 @@ $rio-input-box-text-distance-from-bottom: 0.4rem; // To be aligned with the <inp
|
||||
pointer-events: auto;
|
||||
cursor: pointer;
|
||||
|
||||
font-weight: bold;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
@@ -172,9 +172,8 @@ class DevToolsSidebar(rio.Component):
|
||||
color="primary",
|
||||
selected_value=self.bind().selected_page,
|
||||
margin=0.2,
|
||||
height="grow",
|
||||
),
|
||||
# rio.Spacer(),
|
||||
rio.Spacer(),
|
||||
rio.debug.dev_tools.dev_tools_connector.DevToolsConnector(),
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user