5
0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-17 09:29:30 +08:00

Menu off by default in dev. Toggle with backtick.

This commit is contained in:
Lea Anthony 2021-02-22 20:14:44 +11:00
parent 0f209c8900
commit 17c6201469
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
3 changed files with 57 additions and 18 deletions

View File

@ -620,7 +620,7 @@
} }
/** Menubar **/ /** Menubar **/
const menuVisible = writable(true); const menuVisible = writable(false);
/** Trays **/ /** Trays **/
@ -1220,11 +1220,11 @@
function get_each_context$1(ctx, list, i) { function get_each_context$1(ctx, list, i) {
const child_ctx = ctx.slice(); const child_ctx = ctx.slice();
child_ctx[8] = list[i]; child_ctx[9] = list[i];
return child_ctx; return child_ctx;
} }
// (29:0) {#if $menuVisible } // (38:0) {#if $menuVisible }
function create_if_block$3(ctx) { function create_if_block$3(ctx) {
let div; let div;
let span1; let span1;
@ -1336,11 +1336,11 @@
}; };
} }
// (32:4) {#each $trays as tray} // (41:4) {#each $trays as tray}
function create_each_block$1(ctx) { function create_each_block$1(ctx) {
let traymenu; let traymenu;
let current; let current;
traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[8] } }); traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[9] } });
return { return {
c() { c() {
@ -1352,7 +1352,7 @@
}, },
p(ctx, dirty) { p(ctx, dirty) {
const traymenu_changes = {}; const traymenu_changes = {};
if (dirty & /*$trays*/ 4) traymenu_changes.tray = /*tray*/ ctx[8]; if (dirty & /*$trays*/ 4) traymenu_changes.tray = /*tray*/ ctx[9];
traymenu.$set(traymenu_changes); traymenu.$set(traymenu_changes);
}, },
i(local) { i(local) {
@ -1373,6 +1373,8 @@
function create_fragment$3(ctx) { function create_fragment$3(ctx) {
let if_block_anchor; let if_block_anchor;
let current; let current;
let mounted;
let dispose;
let if_block = /*$menuVisible*/ ctx[1] && create_if_block$3(ctx); let if_block = /*$menuVisible*/ ctx[1] && create_if_block$3(ctx);
return { return {
@ -1384,6 +1386,11 @@
if (if_block) if_block.m(target, anchor); if (if_block) if_block.m(target, anchor);
insert(target, if_block_anchor, anchor); insert(target, if_block_anchor, anchor);
current = true; current = true;
if (!mounted) {
dispose = listen(window, "keydown", /*handleKeydown*/ ctx[3]);
mounted = true;
}
}, },
p(ctx, [dirty]) { p(ctx, [dirty]) {
if (/*$menuVisible*/ ctx[1]) { if (/*$menuVisible*/ ctx[1]) {
@ -1421,6 +1428,8 @@
d(detaching) { d(detaching) {
if (if_block) if_block.d(detaching); if (if_block) if_block.d(detaching);
if (detaching) detach(if_block_anchor); if (detaching) detach(if_block_anchor);
mounted = false;
dispose();
} }
}; };
} }
@ -1440,7 +1449,7 @@
onMount(() => { onMount(() => {
const interval = setInterval( const interval = setInterval(
() => { () => {
$$invalidate(3, time = new Date()); $$invalidate(4, time = new Date());
}, },
1000 1000
); );
@ -1450,33 +1459,52 @@
}; };
}); });
function handleKeydown(e) {
// Backtick toggle
if (e.keyCode == 192) {
menuVisible.update(current => {
return !current;
});
}
}
$$self.$$.update = () => { $$self.$$.update = () => {
if ($$self.$$.dirty & /*time*/ 8) { if ($$self.$$.dirty & /*time*/ 16) {
$$invalidate(4, day = time.toLocaleString("default", { weekday: "short" })); $$invalidate(5, day = time.toLocaleString("default", { weekday: "short" }));
} }
if ($$self.$$.dirty & /*time*/ 8) { if ($$self.$$.dirty & /*time*/ 16) {
$$invalidate(5, dom = time.getDate()); $$invalidate(6, dom = time.getDate());
} }
if ($$self.$$.dirty & /*time*/ 8) { if ($$self.$$.dirty & /*time*/ 16) {
$$invalidate(6, mon = time.toLocaleString("default", { month: "short" })); $$invalidate(7, mon = time.toLocaleString("default", { month: "short" }));
} }
if ($$self.$$.dirty & /*time*/ 8) { if ($$self.$$.dirty & /*time*/ 16) {
$$invalidate(7, currentTime = time.toLocaleString("en-US", { $$invalidate(8, currentTime = time.toLocaleString("en-US", {
hour: "numeric", hour: "numeric",
minute: "numeric", minute: "numeric",
hour12: true hour12: true
}).toLowerCase()); }).toLowerCase());
} }
if ($$self.$$.dirty & /*day, dom, mon, currentTime*/ 240) { if ($$self.$$.dirty & /*day, dom, mon, currentTime*/ 480) {
$$invalidate(0, dateTimeString = `${day} ${dom} ${mon} ${currentTime}`); $$invalidate(0, dateTimeString = `${day} ${dom} ${mon} ${currentTime}`);
} }
}; };
return [dateTimeString, $menuVisible, $trays, time, day, dom, mon, currentTime]; return [
dateTimeString,
$menuVisible,
$trays,
handleKeydown,
time,
day,
dom,
mon,
currentTime
];
} }
class Menubar extends SvelteComponent { class Menubar extends SvelteComponent {

View File

@ -24,6 +24,15 @@
}; };
}); });
function handleKeydown(e) {
// Backtick toggle
if( e.keyCode == 192 ) {
menuVisible.update( (current) => {
return !current;
});
}
}
</script> </script>
{#if $menuVisible } {#if $menuVisible }
@ -37,6 +46,8 @@
</div> </div>
{/if} {/if}
<svelte:window on:keydown={handleKeydown}/>
<style> <style>
.tray-menus { .tray-menus {

View File

@ -13,7 +13,7 @@ export function hideOverlay() {
} }
/** Menubar **/ /** Menubar **/
export const menuVisible = writable(true); export const menuVisible = writable(false);
export function showMenuBar() { export function showMenuBar() {
menuVisible.set(true); menuVisible.set(true);