From adcdf7bad9b202c6bad8130615cd7b07bc8db21f Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 5 Jan 2021 14:54:28 +0100 Subject: [PATCH] Remove unnecessary QML imports CURA-7868 --- resources/qml/TableView.qml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml index 4d9ca75f92..b2ebee51c9 100644 --- a/resources/qml/TableView.qml +++ b/resources/qml/TableView.qml @@ -2,19 +2,15 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Window 2.2 import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one import QtQuick.Controls 2.3 import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM -import Cura 1.6 as Cura OldControls.TableView { - id: tableView - itemDelegate: Item { height: tableCellLabel.implicitHeight + UM.Theme.getSize("thin_margin").height @@ -43,22 +39,23 @@ OldControls.TableView handle: Rectangle { - // both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars + // Both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars implicitWidth: UM.Theme.getSize("scrollbar").width - implicitHeight: UM.Theme.getSize("scrollbar").width // + implicitHeight: UM.Theme.getSize("scrollbar").width radius: width / 2 - color: UM.Theme.getColor(styleData.pressed ? "scrollbar_handle_down" : styleData.hovered ? "scrollbar_handle_hover" : "scrollbar_handle") + color: UM.Theme.getColor(styleData.pressed ? "scrollbar_handle_down" : (styleData.hovered ? "scrollbar_handle_hover" : "scrollbar_handle")) } scrollBarBackground: Rectangle { - // both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars + // Both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars implicitWidth: UM.Theme.getSize("scrollbar").width implicitHeight: UM.Theme.getSize("scrollbar").width color: UM.Theme.getColor("main_background") } - corner: Rectangle // The little rectangle between the vertical and horizontal scrollbars + // The little rectangle between the vertical and horizontal scrollbars + corner: Rectangle { color: UM.Theme.getColor("main_background") } @@ -67,6 +64,4 @@ OldControls.TableView incrementControl: Item { } decrementControl: Item { } } -} - - +} \ No newline at end of file