chaos/VideoPlayer
1
0
Fork 0
Code Activity

[UI] Improved scaling on some UI items.

Browse source
This commit is contained in:
NamedKitten 2018-12-10 08:25:52 +00:00
parent 03f8d8f100
commit fc31931cd4
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,3 +19,4 @@ src_qml*
qmlcache* qmlcache*
qrc_src* qrc_src*
discord-rpc discord-rpc
*.kate-swp

16
src/qml/RoosterTeethButtonLayout.qml
View file

@ -16,8 +16,8 @@ Item {
id: playPauseButton id: playPauseButton
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
MouseArea { MouseArea {
@ -46,8 +46,8 @@ Item {
anchors.left: playPauseButton.right anchors.left: playPauseButton.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
icon.color: hovered icon.color: hovered
|| mouseAreaVolumeArea.containsMouse ? getAppearanceValueForTheme( || mouseAreaVolumeArea.containsMouse ? getAppearanceValueForTheme(
appearance.themeName, appearance.themeName,
@ -95,15 +95,15 @@ Item {
anchors.right: settingsButton.left anchors.right: settingsButton.left
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
SettingsButton { SettingsButton {
id: settingsButton id: settingsButton
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
} }

6
src/qml/UIComponents/VideoProgress.qml
View file

@ -32,7 +32,7 @@ Slider {
} }
function getProgressBarHeight(nyan, isMouse) { 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) { if (appearance.themeName == "Niconico" && !fun.nyanCat) {
return x * 2 return x * 2
} else if (isMouse & !fun.nyanCat) { } else if (isMouse & !fun.nyanCat) {
@ -80,7 +80,7 @@ Slider {
Rectangle { Rectangle {
x: (mouseAreaProgressBar.mouseX - hoverProgressLabel.width / 2) x: (mouseAreaProgressBar.mouseX - hoverProgressLabel.width / 2)
y: progressBackground.y - 20 - hoverProgressLabel.height y: progressBackground.y - (hoverProgressLabel.height * 2)
visible: mouseAreaProgressBar.containsMouse visible: mouseAreaProgressBar.containsMouse
color: getAppearanceValueForTheme(appearance.themeName, color: getAppearanceValueForTheme(appearance.themeName,
"mainBackground") "mainBackground")
@ -163,7 +163,7 @@ Slider {
y: progressBar.topPadding + progressBar.availableHeight / 2 - height / 2 y: progressBar.topPadding + progressBar.availableHeight / 2 - height / 2
implicitHeight: radius implicitHeight: radius
implicitWidth: radius implicitWidth: radius
radius: 12 + (progressBackground.height / 2) radius: mainWindow.virtualHeight / 59
color: appearance.themeName color: appearance.themeName
== "RoosterTeeth" ? "white" : fun.nyanCat ? "transparent" : getAppearanceValueForTheme( == "RoosterTeeth" ? "white" : fun.nyanCat ? "transparent" : getAppearanceValueForTheme(
appearance.themeName, appearance.themeName,

24
src/qml/YouTubeButtonLayout.qml
View file

@ -19,24 +19,24 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: visible ? playlistNextButton.width : 0 width: visible ? playlistNextButton.width : 0
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
PlayPauseButton { PlayPauseButton {
id: playPauseButton id: playPauseButton
anchors.left: playlistPrevButton.right anchors.left: playlistPrevButton.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
PlaylistNextButton { PlaylistNextButton {
id: playlistNextButton id: playlistNextButton
anchors.left: playPauseButton.right anchors.left: playPauseButton.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
MouseArea { MouseArea {
@ -56,8 +56,8 @@ Item {
anchors.left: playlistNextButton.right anchors.left: playlistNextButton.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
VolumeSlider { VolumeSlider {
id: volumeSlider id: volumeSlider
@ -79,15 +79,15 @@ Item {
anchors.right: fullscreenButton.left anchors.right: fullscreenButton.left
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
FullscreenButton { FullscreenButton {
id: fullscreenButton id: fullscreenButton
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
icon.height: parent.height / 2 icon.height: parent.height / 1.25
icon.width: parent.height / 2 icon.width: parent.height / 1.25
} }
} }