Skip to content

Commit

Permalink
0.6.1
Browse files Browse the repository at this point in the history
0.6.1 and updating master with all missing commits
  • Loading branch information
nwittwer authored Aug 11, 2019
2 parents 1c26591 + 79966e6 commit ace84a9
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 147 deletions.
34 changes: 18 additions & 16 deletions src/main/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,25 @@ export function setMenu(window) {
},
{
role: 'help',
submenu: [{
label: 'Community',
click() {
shell.openExternal('https://spectrum.chat/reflex-app')
}
}, {
label: 'Report a Bug',
click() {
shell.openExternal('https://github.com/nwittwer/reflex/issues/new')
}
},
{
label: 'Follow on Twitter',
click() {
shell.openExternal('https://twitter.com/reflex_app')
submenu: [
// {
// label: 'Community',
// click() {
// shell.openExternal('https://spectrum.chat/reflex-app')
// }
// },
{
label: 'Report a Bug',
click() {
shell.openExternal('https://github.com/nwittwer/reflex/issues/new')
}
},
{
label: 'Follow on Twitter',
click() {
shell.openExternal('https://twitter.com/reflex_app')
}
}
}
]
}
]
Expand Down
128 changes: 0 additions & 128 deletions src/renderer/components/ArtboardControls.vue

This file was deleted.

18 changes: 15 additions & 3 deletions src/renderer/views/MainView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<ToolBar ref="toolbar" />
<div id="canvasContainer">
<SidePanel />
<!-- <ArtboardControls /> -->
<div id="canvas" ref="canvas">
<Artboards ref="artboards" />
</div>
Expand All @@ -15,15 +14,14 @@
import ToolBar from "../components/ToolBar";
import Artboards from "../components/Artboards.vue";
import SidePanel from "../components/SidePanel";
import ArtboardControls from "../components/ArtboardControls.vue";
import { Panzoom } from "../mixins/panzoom";
import store from "@/store";
import { ipcRenderer } from "electron";
export default {
name: "MainView",
components: {
Artboards,
ArtboardControls,
SidePanel,
ToolBar
},
Expand Down Expand Up @@ -74,6 +72,20 @@ export default {
});
});
});
// Listen for menu bar events
// TODO Add tests for these
ipcRenderer.on("menu_zoom-to-fit", () => {
document.$panzoom.fitToScreen();
});
ipcRenderer.on("menu_zoom-in", () => {
document.$panzoom.zoomIn()
});
ipcRenderer.on("menu_zoom-out", () => {
document.$panzoom.zoomOut()
});
}
};
</script>
Expand Down

0 comments on commit ace84a9

Please sign in to comment.