vlc | branch: master | Fatih Uzunoglu <[email protected]> | Tue Aug 4 21:06:40 2020 +0300| [ef2abfb81f7c724b121f4e7004114886f19273da] | committer: Pierre Lamot
qml: remove controlbar widget sizing Signed-off-by: Pierre Lamot <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef2abfb81f7c724b121f4e7004114886f19273da --- modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml | 3 +-- modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml | 3 +-- modules/gui/qt/player/qml/PlayerButtonsLayout.qml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml index fab0acc51f..a19bd46cd1 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml @@ -113,8 +113,7 @@ MouseArea { onDropped: { if (drag.source.objectName == "buttonsList") dndView.model.insert(parent.DelegateModel.itemsIndex, - {"id" : drag.source.mIndex, - "size": PlayerControlBarModel.WIDGET_NORMAL}) + {"id" : drag.source.mIndex}) else{ var srcIndex = drag.source.DelegateModel.itemsIndex var destIndex = parent.DelegateModel.itemsIndex diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml index 6d907ce5f6..5b340f7ebe 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml @@ -71,8 +71,7 @@ ListView { onDropped: { if (drag.source.objectName == "buttonsList"){ playerBtnDND.model.insert(playerBtnDND.count, - {"id" : drag.source.mIndex, - "size": PlayerControlBarModel.WIDGET_NORMAL}) + {"id" : drag.source.mIndex}) } else playerBtnDND.model.move( diff --git a/modules/gui/qt/player/qml/PlayerButtonsLayout.qml b/modules/gui/qt/player/qml/PlayerButtonsLayout.qml index ab9c462031..f51a12e99d 100644 --- a/modules/gui/qt/player/qml/PlayerButtonsLayout.qml +++ b/modules/gui/qt/player/qml/PlayerButtonsLayout.qml @@ -70,8 +70,7 @@ RowLayout{ buttonloader.item.focus = true if(buttonloader.item instanceof Widgets.IconToolButton) - buttonloader.item.size = model.size === PlayerControlBarModel.WIDGET_BIG ? - VLCStyle.icon_large : playerButtonsLayout.defaultSize + buttonloader.item.size = playerButtonsLayout.defaultSize //force buttons color if (playerButtonsLayout.forceColors) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
