diff --git a/js/CaTRoX_QWR/Panel_Playlist.js b/js/CaTRoX_QWR/Panel_Playlist.js index 99788242..2ba03fa1 100644 --- a/js/CaTRoX_QWR/Panel_Playlist.js +++ b/js/CaTRoX_QWR/Panel_Playlist.js @@ -110,8 +110,12 @@ function createPlaylistFonts() { playlistFontsCreated = true; } -function rescalePlaylist() { - if (playlistFontsCreated && playlistFontsCreated === is_4k) { +/** + * @param {boolean=} forceRescale + * @returns + */ +function rescalePlaylist(forceRescale) { + if (playlistFontsCreated && !forceRescale) { return; // don't redo fonts } createPlaylistFonts(); diff --git a/js/georgia-main.js b/js/georgia-main.js index f30fa662..7813b04e 100644 --- a/js/georgia-main.js +++ b/js/georgia-main.js @@ -412,7 +412,7 @@ function draw_ui(gr) { drawnInfo = array.join(' | '); infoSize = gr.MeasureString(drawnInfo, infoFont, 0, 0, 0, 0); } - if (drawnInfo.length) { + if (drawnInfo.length && maxInfoWidth) { trackInfoHeight = Math.ceil(infoSize.Height + 1); gr.DrawString(drawnInfo, infoFont, col.artist, infoLeft, geo.top_bg_h - trackInfoHeight - scaleForDisplay(15), maxInfoWidth, trackInfoHeight, StringFormat(2)); gr.SetTextRenderingHint(TextRenderingHint.AntiAliasGridFit); @@ -966,8 +966,8 @@ window.RepaintRect = (x, y, w, h, force = undefined) => { let rotatedCdIndex = 0; // global index of current cdartArray img to draw function setupRotationTimer() { clearInterval(cdartRotationTimer); - console.log(`creating ${pref.spinCdArtImageCount} rotated cd images, shown every ${pref.spinCdArtRedrawInterval}ms`); if (pref.display_cdart && cdart && fb.IsPlaying && !fb.IsPaused && pref.spinCdart && !displayLibrary && !displayPlaylist) { + console.log(`creating ${pref.spinCdArtImageCount} rotated cd images, shown every ${pref.spinCdArtRedrawInterval}ms`); cdartRotationTimer = setInterval(() => { rotatedCdIndex++; rotatedCdIndex %= pref.spinCdArtImageCount; @@ -1429,7 +1429,7 @@ function on_size() { if (fb.IsPlaying) { loadCountryFlags(); // wrong size flag gets loaded on 4k systems } - rescalePlaylist(); + rescalePlaylist(true); initPlaylist(); volume_btn = new VolumeBtn(); sizeInitialized = true; diff --git a/js/ui-components.js b/js/ui-components.js index 407524a2..08bf3158 100644 --- a/js/ui-components.js +++ b/js/ui-components.js @@ -113,6 +113,7 @@ class ProgressBar { this.y = 0; this.w = 0.95 * windowWidth; this.h = geo.prog_bar_h; + this.progressMoved = true; } on_mouse_lbtn_down(x, y) {