Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-29 11:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(touch_bar): update zoom slider value

Browse Source
This commit is contained in:
Elian Doran 2025-03-08 22:46:14 +02:00
parent 36eac98b4d
commit ece26960c3
No known key found for this signature in database
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/app/components/app_context.ts
View File

@ -260,6 +260,7 @@ export type CommandMappings = {
TouchBar: typeof import("electron").TouchBar;
buildIcon(name: string): NativeImage;
};
refreshTouchBar: CommandData;
};
type EventMappings = {

3
src/public/app/widgets/geo_map.ts
View File

@ -53,6 +53,8 @@ export default class GeoMapWidget extends NoteContextAwareWidget {
this.initCallback(L);
}
map.addEventListener("zoom", () => this.triggerCommand("refreshTouchBar"));
L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
detectRetina: true
@ -69,6 +71,7 @@ export default class GeoMapWidget extends NoteContextAwareWidget {
return [
new TouchBar.TouchBarSlider({
label: "Zoom",
value: map.getZoom(),
minValue: map.getMinZoom(),
maxValue: map.getMaxZoom(),
change(newValue) {

36
src/public/app/widgets/touch_bar.ts
View File

@ -8,6 +8,7 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
nativeImage: typeof import("electron").nativeImage;
remote: typeof import("@electron/remote");
lastFocusedComponent?: Component;
constructor() {
super();
@ -19,19 +20,8 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
const target = e.target;
const parentComponentEl = $(target).closest(".component");
// TODO: Remove typecast once it's no longer necessary.
const parentComponent = appContext.getComponentByEl(parentComponentEl[0]) as Component;
const { TouchBar } = this.remote;
if (!parentComponent) {
return;
}
let result = parentComponent.triggerCommand("buildTouchBar", {
TouchBar,
buildIcon: this.buildIcon.bind(this)
});
const touchBar = this.#buildTouchBar(result);
this.remote.getCurrentWindow().setTouchBar(touchBar);
this.lastFocusedComponent = appContext.getComponentByEl(parentComponentEl[0]) as Component;
this.#refreshTouchBar();
});
}
@ -54,6 +44,22 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
return newImage;
}
#refreshTouchBar() {
const { TouchBar } = this.remote;
const parentComponent = this.lastFocusedComponent;
if (!parentComponent) {
return;
}
let result = parentComponent.triggerCommand("buildTouchBar", {
TouchBar,
buildIcon: this.buildIcon.bind(this)
});
const touchBar = this.#buildTouchBar(result);
this.remote.getCurrentWindow().setTouchBar(touchBar);
}
#buildTouchBar(componentSpecificItems?: (TouchBarButton | TouchBarSpacer | TouchBarGroup | TouchBarSegmentedControl)[]) {
const { TouchBar } = this.remote;
const { TouchBarButton, TouchBarSpacer, TouchBarGroup, TouchBarSegmentedControl, TouchBarOtherItemsProxy } = this.remote.TouchBar;
@ -84,4 +90,8 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
});
}
refreshTouchBarEvent() {
this.#refreshTouchBar();
}
}