diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index cc94a62a0..afb1bfedb 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -107,7 +107,7 @@ export default class DesktopLayout { .css("flex-grow", "1") .optChild(!launcherPaneIsHorizontal, launcherPane) .child(new LeftPaneContainer() - .child(new QuickSearchWidget()) + .optChild(!launcherPaneIsHorizontal, new QuickSearchWidget()) .child(appContext.noteTreeWidget) .child(...this.customWidgets.get('left-pane')) ) diff --git a/src/public/app/widgets/containers/launcher.js b/src/public/app/widgets/containers/launcher.js index fc83d7e17..bb3e5c9ad 100644 --- a/src/public/app/widgets/containers/launcher.js +++ b/src/public/app/widgets/containers/launcher.js @@ -10,6 +10,7 @@ import CommandButtonWidget from "../buttons/command_button.js"; import utils from "../../services/utils.js"; import TodayLauncher from "../buttons/launcher/today_launcher.js"; import HistoryNavigationButton from "../buttons/history_navigation.js"; +import QuickSearchWidget from "../quick_search.js"; export default class LauncherWidget extends BasicWidget { constructor() { @@ -88,27 +89,29 @@ export default class LauncherWidget extends BasicWidget { const builtinWidget = note.getLabelValue("builtinWidget"); switch (builtinWidget) { case "calendar": - return new CalendarWidget(note.title, note.getIcon()); + return new CalendarWidget(note.title, note.getIcon()); case "spacer": - // || has to be inside since 0 is a valid value - const baseSize = parseInt(note.getLabelValue("baseSize") || "40"); - const growthFactor = parseInt(note.getLabelValue("growthFactor") || "100"); - - return new SpacerWidget(baseSize, growthFactor); + // || has to be inside since 0 is a valid value + const baseSize = parseInt(note.getLabelValue("baseSize") || "40"); + const growthFactor = parseInt(note.getLabelValue("growthFactor") || "100"); + + return new SpacerWidget(baseSize, growthFactor); case "bookmarks": - return new BookmarkButtons(); + return new BookmarkButtons(); case "protectedSession": - return new ProtectedSessionStatusWidget(); + return new ProtectedSessionStatusWidget(); case "syncStatus": - return new SyncStatusWidget(); + return new SyncStatusWidget(); case "backInHistoryButton": - return new HistoryNavigationButton(note, "backInNoteHistory"); + return new HistoryNavigationButton(note, "backInNoteHistory"); case "forwardInHistoryButton": - return new HistoryNavigationButton(note, "forwardInNoteHistory"); + return new HistoryNavigationButton(note, "forwardInNoteHistory"); case "todayInJournal": - return new TodayLauncher(note); + return new TodayLauncher(note); + case "quickSearch": + return new QuickSearchWidget(); default: - throw new Error(`Unrecognized builtin widget ${builtinWidget} for launcher ${note.noteId} "${note.title}"`); + throw new Error(`Unrecognized builtin widget ${builtinWidget} for launcher ${note.noteId} "${note.title}"`); } } } diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 107199164..f298c8306 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -1136,6 +1136,9 @@ li.dropdown-submenu:hover > ul.dropdown-menu { height: 100%; } +#launcher-pane.horizontal .quick-search { + width: 350px; +} #launcher-pane .icon-action:hover { background-color: var(--hover-item-background-color); diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index 558362d5e..b73dbf0ff 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -34,7 +34,7 @@ interface Item { baseSize?: string; growthFactor?: string; targetNoteId?: "_backendLog" | "_globalNoteMap"; - builtinWidget?: "bookmarks" | "spacer" | "backInHistoryButton" | "forwardInHistoryButton" | "syncStatus" | "protectedSession" | "todayInJournal" | "calendar"; + builtinWidget?: "bookmarks" | "spacer" | "backInHistoryButton" | "forwardInHistoryButton" | "syncStatus" | "protectedSession" | "todayInJournal" | "calendar" | "quickSearch"; command?: keyof typeof Command; } @@ -240,6 +240,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = { { id: '_lbBookmarks', title: 'Bookmarks', type: 'launcher', builtinWidget: 'bookmarks', icon: 'bx bx-bookmark' }, { id: '_lbToday', title: "Open Today's Journal Note", type: 'launcher', builtinWidget: 'todayInJournal', icon: 'bx bx-calendar-star' }, { id: '_lbSpacer2', title: 'Spacer', type: 'launcher', builtinWidget: 'spacer', baseSize: "0", growthFactor: "1" }, + { id: '_lbQuickSearch', title: "Quick Search", type: "launcher", builtinWidget: "quickSearch", icon: "bx bx-rectangle" }, { id: '_lbProtectedSession', title: 'Protected Session', type: 'launcher', builtinWidget: 'protectedSession', icon: 'bx bx bx-shield-quarter' }, { id: '_lbSyncStatus', title: 'Sync Status', type: 'launcher', builtinWidget: 'syncStatus', icon: 'bx bx-wifi' }, { id: '_lbSettings', title: 'Settings', type: 'launcher', command: 'showOptions', icon: 'bx bx-cog' }