gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fix(client): tooltip position for launcher on horizontal layout

Browse Source
This commit is contained in:
Elian Doran 2024-11-22 23:58:15 +02:00
parent 13a997beb0
commit fd8f9506d4
No known key found for this signature in database
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/public/app/widgets/buttons/abstract_button.js
View File

@ -23,7 +23,10 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
this.tooltip = new bootstrap.Tooltip(this.$widget, { this.tooltip = new bootstrap.Tooltip(this.$widget, {
html: true, title: () => this.getTitle(), trigger: 'hover' html: true,
title: () => this.getTitle(),
trigger: 'hover',
placement: this.settings.titlePlacement
}) })
if (this.settings.onContextMenu) { if (this.settings.onContextMenu) {
@ -36,8 +39,6 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
}); });
} }
this.$widget.attr("data-placement", this.settings.titlePlacement);
super.doRender(); super.doRender();
} }

6
src/public/app/widgets/containers/launcher.js
View File

@ -13,10 +13,11 @@ import HistoryNavigationButton from "../buttons/history_navigation.js";
import QuickSearchWidget from "../quick_search.js"; import QuickSearchWidget from "../quick_search.js";
export default class LauncherWidget extends BasicWidget { export default class LauncherWidget extends BasicWidget {
constructor() { constructor(isHorizontalLayout) {
super(); super();
this.innerWidget = null; this.innerWidget = null;
this.isHorizontalLayout = isHorizontalLayout;
} }
isEnabled() { isEnabled() {
@ -64,6 +65,9 @@ export default class LauncherWidget extends BasicWidget {
} }
this.child(this.innerWidget); this.child(this.innerWidget);
if (this.isHorizontalLayout && this.innerWidget.settings) {
this.innerWidget.settings.titlePlacement = "bottom";
}
return true; return true;
} }

9
src/public/app/widgets/containers/launcher_container.js
View File

@ -4,12 +4,13 @@ import appContext from "../../components/app_context.js";
import LauncherWidget from "./launcher.js"; import LauncherWidget from "./launcher.js";
export default class LauncherContainer extends FlexContainer { export default class LauncherContainer extends FlexContainer {
constructor(horizontal) { constructor(isHorizontalLayout) {
super(horizontal ? "row" : "column"); super(isHorizontalLayout ? "row" : "column");
this.id('launcher-container'); this.id('launcher-container');
this.css(horizontal ? "width" : 'height', '100%'); this.css(isHorizontalLayout ? "width" : 'height', '100%');
this.filling(); this.filling();
this.isHorizontalLayout = isHorizontalLayout;
this.load(); this.load();
} }
@ -29,7 +30,7 @@ export default class LauncherContainer extends FlexContainer {
for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) { for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) {
try { try {
const launcherWidget = new LauncherWidget(); const launcherWidget = new LauncherWidget(this.isHorizontalLayout);
const success = await launcherWidget.initLauncher(launcherNote); const success = await launcherWidget.initLauncher(launcherNote);
if (success) { if (success) {