Merge branch 'main' of github.com:cutefishos/uikit into main

src/controls/PopupTips.qml

@@ -14,8 +14,8 @@ Window {
     property alias backgroundColor: _background.color
 
     flags: Qt.WindowStaysOnTopHint | Qt.WindowDoesNotAcceptFocus | Qt.ToolTip
-    width: label.implicitWidth + FishUI.Units.largeSpacing * 2
+    width: label.implicitWidth + FishUI.Units.largeSpacing
-    height: label.implicitHeight + FishUI.Units.largeSpacing * 2
+    height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing
 
     FishUI.WindowShadow {
         view: control

src/fish-style/CheckIndicator.qml

@@ -34,9 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
+import QtQuick 2.9
-import QtQuick.Controls.Material 2.4
+import QtQuick.Controls 2.12
-import QtQuick.Controls.Material.impl 2.4
+import QtQuick.Controls.impl 2.12
 
 import FishUI 1.0 as FishUI