diff --git a/.gitignore b/.gitignore index c851c51..dddc7c1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ src_qml* qmlcache* qrc_src* discord-rpc +*.kate-swp diff --git a/src/qml/RoosterTeethButtonLayout.qml b/src/qml/RoosterTeethButtonLayout.qml index d2758dc..5393767 100644 --- a/src/qml/RoosterTeethButtonLayout.qml +++ b/src/qml/RoosterTeethButtonLayout.qml @@ -16,8 +16,8 @@ Item { id: playPauseButton anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } MouseArea { @@ -46,8 +46,8 @@ Item { anchors.left: playPauseButton.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 icon.color: hovered || mouseAreaVolumeArea.containsMouse ? getAppearanceValueForTheme( appearance.themeName, @@ -95,15 +95,15 @@ Item { anchors.right: settingsButton.left anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } SettingsButton { id: settingsButton anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } } diff --git a/src/qml/UIComponents/VideoProgress.qml b/src/qml/UIComponents/VideoProgress.qml index e9aded4..b8c6664 100644 --- a/src/qml/UIComponents/VideoProgress.qml +++ b/src/qml/UIComponents/VideoProgress.qml @@ -32,7 +32,7 @@ Slider { } function getProgressBarHeight(nyan, isMouse) { - var x = fun.nyanCat ? mainWindow.virtualHeight / 64 : Screen.height / 380 + var x = fun.nyanCat ? mainWindow.virtualHeight / 64 : mainWindow.virtualHeight / 380 if (appearance.themeName == "Niconico" && !fun.nyanCat) { return x * 2 } else if (isMouse & !fun.nyanCat) { @@ -80,7 +80,7 @@ Slider { Rectangle { x: (mouseAreaProgressBar.mouseX - hoverProgressLabel.width / 2) - y: progressBackground.y - 20 - hoverProgressLabel.height + y: progressBackground.y - (hoverProgressLabel.height * 2) visible: mouseAreaProgressBar.containsMouse color: getAppearanceValueForTheme(appearance.themeName, "mainBackground") @@ -163,7 +163,7 @@ Slider { y: progressBar.topPadding + progressBar.availableHeight / 2 - height / 2 implicitHeight: radius implicitWidth: radius - radius: 12 + (progressBackground.height / 2) + radius: mainWindow.virtualHeight / 59 color: appearance.themeName == "RoosterTeeth" ? "white" : fun.nyanCat ? "transparent" : getAppearanceValueForTheme( appearance.themeName, diff --git a/src/qml/YouTubeButtonLayout.qml b/src/qml/YouTubeButtonLayout.qml index e7310dd..5f71681 100644 --- a/src/qml/YouTubeButtonLayout.qml +++ b/src/qml/YouTubeButtonLayout.qml @@ -19,24 +19,24 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom width: visible ? playlistNextButton.width : 0 - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } PlayPauseButton { id: playPauseButton anchors.left: playlistPrevButton.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } PlaylistNextButton { id: playlistNextButton anchors.left: playPauseButton.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } MouseArea { @@ -56,8 +56,8 @@ Item { anchors.left: playlistNextButton.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } VolumeSlider { id: volumeSlider @@ -79,15 +79,15 @@ Item { anchors.right: fullscreenButton.left anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } FullscreenButton { id: fullscreenButton anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom - icon.height: parent.height / 2 - icon.width: parent.height / 2 + icon.height: parent.height / 1.25 + icon.width: parent.height / 1.25 } }