From d87dc4e066b1cbe8d8d3b4bbb1f7fe0e5897bf2a Mon Sep 17 00:00:00 2001 From: namedkitten Date: Wed, 29 Apr 2020 13:11:24 +0100 Subject: [PATCH] Fix progress bar handle and niconico theme. --- src/qml/UIComponents/SmoothButton.qml | 4 ++-- src/qml/UIComponents/VideoProgress.qml | 4 +--- src/qml/icons/Niconico/backward.svg | 3 ++- src/qml/icons/Niconico/forward.svg | 2 +- src/qml/icons/Niconico/fullscreen.svg | 2 +- src/qml/icons/Niconico/next.svg | 2 +- src/qml/icons/Niconico/pause.svg | 2 +- src/qml/icons/Niconico/play.svg | 2 +- src/qml/icons/Niconico/prev.svg | 2 +- src/qml/icons/Niconico/settings.svg | 2 +- src/qml/icons/Niconico/volume-down.svg | 2 +- src/qml/icons/Niconico/volume-mute.svg | 2 +- src/qml/icons/Niconico/volume-up.svg | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/qml/UIComponents/SmoothButton.qml b/src/qml/UIComponents/SmoothButton.qml index 480b11e..de56cb9 100644 --- a/src/qml/UIComponents/SmoothButton.qml +++ b/src/qml/UIComponents/SmoothButton.qml @@ -20,8 +20,8 @@ Control { id: buttonImage smooth: true fillMode: Image.PreserveAspectFit - sourceSize.height: Math.floor(root.parent.height / (appearance.themeName == "Niconico" ? 2 : 1.25)) - sourceSize.width: Math.floor(root.parent.height / (appearance.themeName == "Niconico" ? 2 : 1.25)) + sourceSize.height: Math.floor(root.parent.height / (appearance.themeName == "Niconico" ? 1.8 : 1.25)) + sourceSize.width: Math.floor(root.parent.height / (appearance.themeName == "Niconico" ? 1.8 : 1.25)) ColorOverlay { id: colorOverlay anchors.fill: parent diff --git a/src/qml/UIComponents/VideoProgress.qml b/src/qml/UIComponents/VideoProgress.qml index 4da9317..48eddda 100644 --- a/src/qml/UIComponents/VideoProgress.qml +++ b/src/qml/UIComponents/VideoProgress.qml @@ -168,9 +168,7 @@ Slider { z: 70 id: handleRect x: progressBar.visualPosition * (progressBar.availableWidth - width) - anchors.bottom: parent.bottom - anchors.bottomMargin: progressBar.center ? (progressBar.height / 2) - - (height / 2) : -height / 4 + anchors.verticalCenter: parent.background.verticalCenter implicitHeight: radius implicitWidth: radius radius: mainWindow.virtualHeight / 59 diff --git a/src/qml/icons/Niconico/backward.svg b/src/qml/icons/Niconico/backward.svg index d7d639d..1f4120b 100644 --- a/src/qml/icons/Niconico/backward.svg +++ b/src/qml/icons/Niconico/backward.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/qml/icons/Niconico/forward.svg b/src/qml/icons/Niconico/forward.svg index c16cfba..b6e1557 100644 --- a/src/qml/icons/Niconico/forward.svg +++ b/src/qml/icons/Niconico/forward.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/fullscreen.svg b/src/qml/icons/Niconico/fullscreen.svg index 23a1a9f..ca141bd 100644 --- a/src/qml/icons/Niconico/fullscreen.svg +++ b/src/qml/icons/Niconico/fullscreen.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/next.svg b/src/qml/icons/Niconico/next.svg index 5850c17..7ff4a9a 100644 --- a/src/qml/icons/Niconico/next.svg +++ b/src/qml/icons/Niconico/next.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/pause.svg b/src/qml/icons/Niconico/pause.svg index 1300f52..48620df 100644 --- a/src/qml/icons/Niconico/pause.svg +++ b/src/qml/icons/Niconico/pause.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/play.svg b/src/qml/icons/Niconico/play.svg index 09f001a..c9676e3 100644 --- a/src/qml/icons/Niconico/play.svg +++ b/src/qml/icons/Niconico/play.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/prev.svg b/src/qml/icons/Niconico/prev.svg index 280825d..01b2d8a 100644 --- a/src/qml/icons/Niconico/prev.svg +++ b/src/qml/icons/Niconico/prev.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/settings.svg b/src/qml/icons/Niconico/settings.svg index 5a16b1b..273b638 100644 --- a/src/qml/icons/Niconico/settings.svg +++ b/src/qml/icons/Niconico/settings.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/volume-down.svg b/src/qml/icons/Niconico/volume-down.svg index a4c9dfd..1b8ff4a 100644 --- a/src/qml/icons/Niconico/volume-down.svg +++ b/src/qml/icons/Niconico/volume-down.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/volume-mute.svg b/src/qml/icons/Niconico/volume-mute.svg index 1edee5c..4a94e03 100644 --- a/src/qml/icons/Niconico/volume-mute.svg +++ b/src/qml/icons/Niconico/volume-mute.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/qml/icons/Niconico/volume-up.svg b/src/qml/icons/Niconico/volume-up.svg index a4c9dfd..1b8ff4a 100644 --- a/src/qml/icons/Niconico/volume-up.svg +++ b/src/qml/icons/Niconico/volume-up.svg @@ -1 +1 @@ - \ No newline at end of file +