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

Merge pull request #228 from yazninja/upcoming

Browse source 
Add Marquee Back
This commit is contained in:
booploops 2022-01-26 20:26:39 -08:00 • committed by GitHub
commit 3dcf04062a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/renderer/index.js
View file

@ -3411,6 +3411,7 @@ const app = new Vue({
let element = document.querySelector(selector);
var overflowX = element.offsetWidth < element.scrollWidth,
overflowY = element.offsetHeight < element.scrollHeight;
element.setAttribute('data-value', '\xa0\xa0\xa0\xa0' + element.textContent);
return (overflowX || overflowY); } catch (e) { return false}
},
@ -3418,34 +3419,6 @@ const app = new Vue({
//this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','')
this.webremoteurl = await ipcRenderer.invoke('showQR','')
//this.modals.qrcode = true;
},
checkMarquee() {
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) {
document.getElementsByClassName('song-artist')[0].classList.add('marquee');
document.getElementsByClassName('song-artist')[1].classList.add('marquee-after');
}
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) {
document.getElementsByClassName('song-name')[0].classList.add('marquee');
document.getElementsByClassName('song-name')[1].classList.add('marquee-after');
}
},
closeWindow(){
switch (app.cfg.general.close_behavior) {
case 0:
case '0':
ipcRenderer.send('close');
break;
case 1:
case '1':
ipcRenderer.send('minimize');
break;
case 2:
case '2':
ipcRenderer.send('minimizeTray');
break;
}
}
}

19
src/renderer/style.less
View file

@ -1111,6 +1111,9 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
&.song-name{
overflow: unset ;
}
&::after{
content: attr(data-value);
}
}
@ -1166,11 +1169,11 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
@keyframes marquee {
from {
transform: translateX(100%);
transform: translateX(0);
}
to {
transform: translateX(-100%);
transform: translateX(-140%);
}
}
@ -1249,13 +1252,12 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
display: flex;
position: relative;
}
.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album {
.app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album {
font-weight: 400;
font-size: 12px;
text-align: center;
/*height: 1.2em;
line-height: 1.2em;*/
z-index: 1;
align-items: center;
justify-content: center;
@ -1263,10 +1265,17 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
max-width: 340px;
overflow: hidden;
.song-artist-album-content{
font-weight: 400;
font-size: 12px;
text-align: center;
width:100%;
.song-artist-normal {
&.song-artist-normal {
height: inherit;
}
}
&.song-artist-marquee {
> marquee {

9
src/renderer/views/main.ejs
View file

@ -86,17 +86,17 @@
<mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
</div>
<div class="playback-info">
<!-- :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']" -->
<div class="song-name" style="-webkit-box-orient: horizontal;"
:class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']"
:style="[mk.nowPlayingItem['attributes']['contentRating'] == 'explicit' ? {'margin-left' : '23px'} : {'margin-left' : '0px'} ]">
{{ mk.nowPlayingItem["attributes"]["name"] }}
<div class="explicit-icon"
v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
style="display: inline-block"></div>
</div>
<!-- :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') ? 'marquee' : '']" -->
<div class="song-artist-album"
<div class="song-artist-album">
<div class="song-artist-album-content"
:class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"
style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
<div class="item-navigate song-artist" style="display: inline-block"
@click="getNowPlayingItemDetailed(`artist`)">
@ -110,6 +110,7 @@
(mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
</div>
</div>
</div>
<div class="song-progress">
<div class="song-duration"