okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reimp e133b2c, adjustments for macOS

Browse source
This commit is contained in:
booploops 2022-07-03 22:26:02 -07:00
parent e133b2c38b
commit a72dd90280
5 changed files with 299 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.circleci/config.yml
View file

@ -147,6 +147,7 @@ jobs:
- run: - run:
name: Publish Release name: Publish Release
command: | command: |
echo "Creating release for Cider v${APP_VERSION} on the ${CIRCLE_BRANCH} branch."
gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
# Orchestrate our job run sequence # Orchestrate our job run sequence

34
src/renderer/less/macos.less
View file

@ -1,6 +1,6 @@
body[platform="darwin"] { body[platform="darwin"] {
html { html {
background: transparent!important; background: transparent !important;
} }
&.notransparency::before { &.notransparency::before {
@ -11,6 +11,7 @@ body[platform="darwin"] {
&.simplebg { &.simplebg {
background: transparent; background: transparent;
} }
&::before { &::before {
display: none; display: none;
} }
@ -26,6 +27,7 @@ body[platform="darwin"] {
.app-chrome .app-chrome-item.search { .app-chrome .app-chrome-item.search {
margin-right: 12px; margin-right: 12px;
} }
.app-chrome .app-mainmenu { .app-chrome .app-mainmenu {
width: 46px; width: 46px;
} }
@ -35,15 +37,20 @@ body[platform="darwin"] {
} }
} }
// &::after { &[window-state="normal"] {
// position: fixed; &::after {
// top:0;left:0;right:0;bottom:0; position: fixed;
// box-shadow: inset 0px 0px .5px 1px rgb(200 200 200 / 40%); top: 0;
// border-radius: 10px; left: 0;
// content: " "; right: 0;
// z-index: 999999; bottom: 0;
// pointer-events: none; box-shadow: inset 0px 0px .5px 1px rgb(200 200 200 / 40%);
// } border-radius: 10px;
content: " ";
z-index: 999999;
pointer-events: none;
}
}
} }
#app-main { #app-main {
@ -58,6 +65,13 @@ body[platform="darwin"] {
} }
} }
.settings-window.maxed {
.tabs>.col-auto {
transition: padding-top .3s linear;
padding-top: var(--chromeHeight1);
}
}
#apple-music-video-player-controls #player-exit { #apple-music-video-player-controls #player-exit {
margin-top: 18px; margin-top: 18px;
left: 70px; left: 70px;

85
src/renderer/less/pages.less
View file

@ -54,7 +54,7 @@
width: 320px; width: 320px;
font-size: 14px; font-size: 14px;
position: absolute; position: absolute;
overflow: auto; overflow: overlay;
padding-bottom: 16px; padding-bottom: 16px;
> .list-group { > .list-group {
@ -80,7 +80,7 @@
padding: 16px 32px; padding: 16px 32px;
overflow: auto; overflow: auto;
position: fixed; position: fixed;
width: calc(100% - 574px); // width: calc(100% - 574px);
margin-left: 320px; margin-left: 320px;
padding-bottom: 16px; padding-bottom: 16px;
} }
@ -118,7 +118,10 @@
//Styles Page //Styles Page
.installed-themes-page { .installed-themes-page {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
.themeContextMenu { .themeContextMenu {
background: transparent; background: transparent;
color: var(--keyColor); color: var(--keyColor);
@ -157,7 +160,11 @@
.gh-header { .gh-header {
z-index: 5; z-index: 5;
padding: 16px;
flex: 0 0 auto;
height: 64px;
display: grid;
align-content: center;
.header-text { .header-text {
position: initial !important; position: initial !important;
justify-content: left !important; justify-content: left !important;
@ -165,17 +172,17 @@
} }
.gh-content { .gh-content {
display: contents; display: flex;
flex-direction: column; flex-direction: row;
padding: 0px; padding: 0px;
height: 100%;
flex: 0 0 auto;
.repos-list { .repos-list {
width: 320px; width: 320px;
position: fixed; overflow: overlay;
overflow: auto;
height: 90%; height: 90%;
font-size: 14px; font-size: 14px;
margin: 0 auto;
white-space: nowrap; white-space: nowrap;
> .list-group { > .list-group {
@ -197,13 +204,11 @@
} }
.style-editor-container { .style-editor-container {
height: 90%; height: 100%;
flex: 1; flex: 1;
padding: 0px; padding: 0px;
margin-left: 320px; width: 100%;
position: fixed; overflow: hidden;
overflow: auto;
width: calc(100% - 574px);
.stylestack-editor { .stylestack-editor {
padding-bottom: 16px; padding-bottom: 16px;
@ -2070,7 +2075,7 @@
.settings-window { .settings-window {
background: var(--baseColorMix); background: var(--baseColorMix);
max-width: 80%; max-width: 90%;
max-height: 90%; max-height: 90%;
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -2107,6 +2112,9 @@
display: flex; display: flex;
gap: 10px; gap: 10px;
align-items: center; align-items: center;
:nth-child(2) {
}
} }
@ -2165,6 +2173,11 @@
background-color: rgb(196, 43, 28) background-color: rgb(196, 43, 28)
} }
&.back-btn {
left: 10px;
right: unset;
}
&.minmax-btn { &.minmax-btn {
right: 52px; right: 52px;
@ -2192,6 +2205,9 @@
> .col-auto { > .col-auto {
width: 230px; width: 230px;
overflow-x: hidden;
overflow-y: overlay;
transition: width 0.25s ease-in-out;
} }
.tab-content { .tab-content {
@ -2203,9 +2219,48 @@
overflow-y: overlay; overflow-y: overlay;
height: 100%; height: 100%;
background-color: var(--panelColor2); background-color: var(--panelColor2);
padding:0px;
padding-top: 48px; padding-top: 48px;
border-left: 1px solid var(--borderColor); border-left: 1px solid var(--borderColor);
} }
.github-themes-page, .installed-themes-page {
.header-text {
font-size: 1.25em;
}
}
.tab-pane {
height:100%;
}
.settings-tab-content {
height:100%;
}
&.no-sidebar {
.gh-header {
>.row {
&:last-child {
padding-right: 90px;
}
}
}
.tab-content {
padding-top:0px;
}
.tabs {
.nav-pills .nav-link {
:nth-child(2) {
display: none;
}
}
>.col-auto {
width: 80px;
}
}
}
} }
} }

33
src/renderer/style.css
View file

@ -12985,7 +12985,6 @@ input[type=checkbox][switch]:checked:active::before {
.github-themes-page { .github-themes-page {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-top: var(--chromeHeight1);
height: 100%; height: 100%;
} }
.github-themes-page .github-avatar { .github-themes-page .github-avatar {
@ -13009,10 +13008,12 @@ input[type=checkbox][switch]:checked:active::before {
margin: 0px; margin: 0px;
} }
.github-themes-page .repos-list { .github-themes-page .repos-list {
height: 100%; height: 85%;
overflow-y: overlay;
width: 320px; width: 320px;
font-size: 14px; font-size: 14px;
position: absolute;
overflow: auto;
padding-bottom: 16px;
} }
.github-themes-page .repos-list > .list-group { .github-themes-page .repos-list > .list-group {
margin: 0px; margin: 0px;
@ -13027,11 +13028,14 @@ input[type=checkbox][switch]:checked:active::before {
filter: brightness(0.8); filter: brightness(0.8);
} }
.github-themes-page .github-preview { .github-themes-page .github-preview {
height: 100%; height: 85%;
flex: 1; flex: 1;
background: var(--color2);
padding: 16px 32px; padding: 16px 32px;
overflow-y: overlay; overflow: auto;
position: fixed;
width: calc(100% - 574px);
margin-left: 320px;
padding-bottom: 16px;
} }
.github-themes-page .gh-content { .github-themes-page .gh-content {
display: flex; display: flex;
@ -13042,6 +13046,10 @@ input[type=checkbox][switch]:checked:active::before {
.github-themes-page .gh-header { .github-themes-page .gh-header {
padding: 16px; padding: 16px;
} }
.github-themes-page .gh-header .header-text {
position: initial !important;
justify-content: left !important;
}
.github-themes-page .installed-themes-page .style-editor-container { .github-themes-page .installed-themes-page .style-editor-container {
height: 100%; height: 100%;
flex: 1; flex: 1;
@ -13086,8 +13094,8 @@ input[type=checkbox][switch]:checked:active::before {
z-index: 5; z-index: 5;
} }
.installed-themes-page .gh-header .header-text { .installed-themes-page .gh-header .header-text {
position: initial; position: initial !important;
justify-content: left; justify-content: left !important;
} }
.installed-themes-page .gh-content { .installed-themes-page .gh-content {
display: contents; display: contents;
@ -13096,10 +13104,12 @@ input[type=checkbox][switch]:checked:active::before {
} }
.installed-themes-page .gh-content .repos-list { .installed-themes-page .gh-content .repos-list {
width: 320px; width: 320px;
position: absolute; position: fixed;
overflow: auto; overflow: auto;
height: 90%; height: 90%;
font-size: 14px; font-size: 14px;
margin: 0 auto;
white-space: nowrap;
} }
.installed-themes-page .gh-content .repos-list > .list-group { .installed-themes-page .gh-content .repos-list > .list-group {
margin: 0px; margin: 0px;
@ -13117,12 +13127,11 @@ input[type=checkbox][switch]:checked:active::before {
.installed-themes-page .gh-content .style-editor-container { .installed-themes-page .gh-content .style-editor-container {
height: 90%; height: 90%;
flex: 1; flex: 1;
/* background: var(--color2); */
padding: 0px; padding: 0px;
margin-left: 320px; margin-left: 320px;
position: absolute; position: fixed;
overflow: auto; overflow: auto;
width: calc(-webkit-fill-available - 320px); width: calc(100% - 574px);
} }
.installed-themes-page .gh-content .style-editor-container .stylestack-editor { .installed-themes-page .gh-content .style-editor-container .stylestack-editor {
padding-bottom: 16px; padding-bottom: 16px;

36
src/renderer/views/components/settings-window.ejs
View file

@ -1,7 +1,7 @@
<script type="text/x-template" id="settings-window"> <script type="text/x-template" id="settings-window">
<div class="settings-panel" @click.self="close()"> <div class="settings-panel" @click.self="close()">
<div class="settings-window" :class="{'maxed': $store.state.pageState['settings'].fullscreen}"> <div class="settings-window" :class="{'maxed': $store.state.pageState['settings'].fullscreen, 'no-sidebar': sidebarVis()}">
<button class="close-btn minmax-btn" @click="$store.state.pageState['settings'].fullscreen = !$store.state.pageState['settings'].fullscreen" :class="{'min': $store.state.pageState['settings'].fullscreen}" @click="minmax()"></button> <button class="close-btn minmax-btn" @click="$store.state.pageState['settings'].fullscreen = !$store.state.pageState['settings'].fullscreen" :class="{'min': $store.state.pageState['settings'].fullscreen}"></button>
<button class="close-btn" @click="close()"></button> <button class="close-btn" @click="close()"></button>
<b-tabs class="no-style" pills vertical content-class="mt-3" v-model="$store.state.pageState['settings'].currentTabIndex"> <b-tabs class="no-style" pills vertical content-class="mt-3" v-model="$store.state.pageState['settings'].currentTabIndex">
<b-tab> <b-tab>
@ -1488,7 +1488,7 @@
<script> <script>
Vue.component("settings-window", { Vue.component("settings-window", {
template: "#settings-window", template: "#settings-window",
data: function () { data: function() {
return { return {
app: this.$root, app: this.$root,
themes: ipcRenderer.sendSync("get-themes"), themes: ipcRenderer.sendSync("get-themes"),
@ -1496,14 +1496,22 @@
canChangeHash: false, canChangeHash: false,
lastfmConnecting: false lastfmConnecting: false
} }
}, watch: { },
tabIndex: function (val) { watch: {
tabIndex: function(val) {
if (this.canChangeHash) { if (this.canChangeHash) {
// window.location.hash = `#settings/${val}` // window.location.hash = `#settings/${val}`
} }
} }
}, },
methods: { methods: {
sidebarVis() {
const tabIndex = app.$store.state.pageState['settings'].currentTabIndex
if(tabIndex == 3 || tabIndex == 5 || tabIndex == 10 || tabIndex == 11) {
return true;
}
return false
},
close() { close() {
this.$root.modals.settings = false this.$root.modals.settings = false
}, },
@ -1530,7 +1538,7 @@
openAppData() { openAppData() {
ipcRenderer.send('open-appdata') ipcRenderer.send('open-appdata')
}, },
getLanguages: function () { getLanguages: function() {
let langs = this.$root.lzListing let langs = this.$root.lzListing
let categories = { let categories = {
"main": [], "main": [],
@ -1554,10 +1562,10 @@
removeExperiment(flag) { removeExperiment(flag) {
app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1); app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
}, },
toggleAudioContext: function () { toggleAudioContext: function() {
if (app.cfg.advanced.AudioContext === true) { if (app.cfg.advanced.AudioContext === true) {
if (navigator.hardwareConcurrency < 6) { if (navigator.hardwareConcurrency < 6) {
app.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function (result) { app.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function(result) {
if (result) { if (result) {
CiderAudio.init(); CiderAudio.init();
if (app.cfg.audio.normalization === true) { if (app.cfg.audio.normalization === true) {
@ -1575,20 +1583,20 @@
CiderAudio.off(); CiderAudio.off();
} }
}, },
toggleNormalization: function () { toggleNormalization: function() {
if (app.cfg.audio.normalization) { if (app.cfg.audio.normalization) {
CiderAudio.normalizerOn() CiderAudio.normalizerOn()
} else { } else {
CiderAudio.normalizerOff() CiderAudio.normalizerOff()
} }
}, },
changeAudioQuality: function () { changeAudioQuality: function() {
app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality]; app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
}, },
toggleUserInfo: function () { toggleUserInfo: function() {
app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo
}, },
sendDataToMTT: function () { sendDataToMTT: function() {
ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior); ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior);
// setStoreValue does not change plugin store values somehow // setStoreValue does not change plugin store values somehow
ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior); ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior);
@ -1604,7 +1612,7 @@
}, },
promptForRelaunch() { promptForRelaunch() {
app.confirm(app.getLz('action.relaunch.confirm'), function (result) { app.confirm(app.getLz('action.relaunch.confirm'), function(result) {
if (result) { if (result) {
ipcRenderer.send('relaunchApp', ''); ipcRenderer.send('relaunchApp', '');
} }