vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Wed Dec 23 20:02:31 2020 +0530| [70a36b5a310abb1edaf545434854b281be0a5dbf] | committer: Pierre Lamot
qml: explicitly assign size of buttons in local toolbar from VLCStyle Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70a36b5a310abb1edaf545434854b281be0a5dbf --- modules/gui/qt/maininterface/qml/BannerSources.qml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt/maininterface/qml/BannerSources.qml b/modules/gui/qt/maininterface/qml/BannerSources.qml index d8243668fd..d06df3ae0c 100644 --- a/modules/gui/qt/maininterface/qml/BannerSources.qml +++ b/modules/gui/qt/maininterface/qml/BannerSources.qml @@ -121,7 +121,8 @@ Widgets.NavigableFocusScope { size: VLCStyle.banner_icon_size iconText: VLCIcons.topbar_previous text: i18n.qtr("Previous") - height: localToolbar.height + height: VLCStyle.bannerButton_height + width: VLCStyle.bannerButton_width colorDisabled: VLCStyle.colors.textDisabled onClicked: history.previous() enabled: !history.previousEmpty @@ -212,10 +213,12 @@ Widgets.NavigableFocusScope { Widgets.IconToolButton { id: list_grid_btn + + width: VLCStyle.bannerButton_width + height: VLCStyle.bannerButton_height size: VLCStyle.banner_icon_size iconText: mainInterface.gridView ? VLCIcons.list : VLCIcons.grid text: i18n.qtr("List/Grid") - height: localToolbar.height onClicked: mainInterface.gridView = !mainInterface.gridView enabled: true } @@ -226,7 +229,8 @@ Widgets.NavigableFocusScope { textRole: "text" criteriaRole: "criteria" - height: localToolbar.height + width: VLCStyle.bannerButton_width + height: VLCStyle.bannerButton_height iconSize: VLCStyle.banner_icon_size popupAlignment: Qt.AlignLeft | Qt.AlignBottom @@ -368,7 +372,8 @@ Widgets.NavigableFocusScope { contentModel: root.contentModel visible: root.contentModel !== undefined enabled: visible - height: playlistGroup.height + height: VLCStyle.bannerButton_height + buttonWidth: VLCStyle.bannerButton_width } Widgets.IconToolButton { @@ -377,7 +382,8 @@ Widgets.NavigableFocusScope { size: VLCStyle.banner_icon_size iconText: VLCIcons.playlist text: i18n.qtr("Playlist") - height: playlistGroup.height + width: VLCStyle.bannerButton_width + height: VLCStyle.bannerButton_height onClicked: mainInterface.playlistVisible = !mainInterface.playlistVisible color: mainInterface.playlistVisible && !playlist_btn.backgroundVisible ? VLCStyle.colors.accent : VLCStyle.colors.buttonText @@ -389,7 +395,8 @@ Widgets.NavigableFocusScope { size: VLCStyle.banner_icon_size iconText: VLCIcons.ellipsis text: i18n.qtr("Menu") - height: playlistGroup.height + width: VLCStyle.bannerButton_width + height: VLCStyle.bannerButton_height onClicked: contextMenu.popup(this.mapToGlobal(0, height)) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
