diff --git a/src/imports/FluentUI/Controls/FluTour.qml b/src/imports/FluentUI/Controls/FluTour.qml index 76abba00..6d6cdf8a 100644 --- a/src/imports/FluentUI/Controls/FluTour.qml +++ b/src/imports/FluentUI/Controls/FluTour.qml @@ -67,7 +67,8 @@ Popup{ id:canvas anchors.fill: parent onPaint: { - d.pos = d.target.mapToItem(control,0,0) + d.pos = d.target.mapToGlobal(0,0) + d.pos = Qt.point(d.pos.x-d.window.x,d.pos.y-d.window.y) var ctx = canvas.getContext("2d") ctx.clearRect(0, 0, canvasSize.width, canvasSize.height) ctx.save() @@ -159,8 +160,8 @@ Popup{ top: parent.top margins: 10 } - width: 20 - height: 20 + width: 26 + height: 26 iconSize: 12 iconSource : FluentIcons.ChromeClose onClicked: { diff --git a/src/imports/FluentUI/qmldir b/src/imports/FluentUI/qmldir deleted file mode 100644 index 52032839..00000000 --- a/src/imports/FluentUI/qmldir +++ /dev/null @@ -1,84 +0,0 @@ -module FluentUI -classname FluentUIPlugin -typeinfo plugins.qmltypes - -FluAcrylic 1.0 Controls/FluAcrylic.qml -FluAppBar 1.0 Controls/FluAppBar.qml -FluArea 1.0 Controls/FluArea.qml -FluAutoSuggestBox 1.0 Controls/FluAutoSuggestBox.qml -FluBadge 1.0 Controls/FluBadge.qml -FluBreadcrumbBar 1.0 Controls/FluBreadcrumbBar.qml -FluButton 1.0 Controls/FluButton.qml -FluCalendarPicker 1.0 Controls/FluCalendarPicker.qml -FluCalendarView 1.0 Controls/FluCalendarView.qml -FluCarousel 1.0 Controls/FluCarousel.qml -FluCheckBox 1.0 Controls/FluCheckBox.qml -FluColorPicker 1.0 Controls/FluColorPicker.qml -FluColorView 1.0 Controls/FluColorView.qml -FluComboBox 1.0 Controls/FluComboBox.qml -FluContentDialog 1.0 Controls/FluContentDialog.qml -FluContentPage 1.0 Controls/FluContentPage.qml -FluControl 1.0 Controls/FluControl.qml -FluCopyableText 1.0 Controls/FluCopyableText.qml -FluDatePicker 1.0 Controls/FluDatePicker.qml -FluDivider 1.0 Controls/FluDivider.qml -FluDropDownButton 1.0 Controls/FluDropDownButton.qml -FluExpander 1.0 Controls/FluExpander.qml -FluFilledButton 1.0 Controls/FluFilledButton.qml -FluFlipView 1.0 Controls/FluFlipView.qml -FluFocusRectangle 1.0 Controls/FluFocusRectangle.qml -FluIcon 1.0 Controls/FluIcon.qml -FluIconButton 1.0 Controls/FluIconButton.qml -FluImage 1.0 Controls/FluImage.qml -FluInfoBar 1.0 Controls/FluInfoBar.qml -FluItem 1.0 Controls/FluItem.qml -FluItemDelegate 1.0 Controls/FluItemDelegate.qml -FluMenu 1.0 Controls/FluMenu.qml -FluMenuBar 1.0 Controls/FluMenuBar.qml -FluMenuBarItem 1.0 Controls/FluMenuBarItem.qml -FluMenuItem 1.0 Controls/FluMenuItem.qml -FluMenuSeparator 1.0 Controls/FluMenuSeparator.qml -FluMultilineTextBox 1.0 Controls/FluMultilineTextBox.qml -FluNavigationView 1.0 Controls/FluNavigationView.qml -FluObject 1.0 Controls/FluObject.qml -FluPage 1.0 Controls/FluPage.qml -FluPagination 1.0 Controls/FluPagination.qml -FluPaneItem 1.0 Controls/FluPaneItem.qml -FluPaneItemEmpty 1.0 Controls/FluPaneItemEmpty.qml -FluPaneItemExpander 1.0 Controls/FluPaneItemExpander.qml -FluPaneItemHeader 1.0 Controls/FluPaneItemHeader.qml -FluPaneItemSeparator 1.0 Controls/FluPaneItemSeparator.qml -FluPasswordBox 1.0 Controls/FluPasswordBox.qml -FluPivot 1.0 Controls/FluPivot.qml -FluPivotItem 1.0 Controls/FluPivotItem.qml -FluPopup 1.0 Controls/FluPopup.qml -FluProgressBar 1.0 Controls/FluProgressBar.qml -FluProgressRing 1.0 Controls/FluProgressRing.qml -FluRadioButton 1.0 Controls/FluRadioButton.qml -FluRadioButtons 1.0 Controls/FluRadioButtons.qml -FluRatingControl 1.0 Controls/FluRatingControl.qml -FluRectangle 1.0 Controls/FluRectangle.qml -FluRemoteLoader 1.0 Controls/FluRemoteLoader.qml -FluScrollBar 1.0 Controls/FluScrollBar.qml -FluScrollIndicator 1.0 Controls/FluScrollIndicator.qml -FluScrollablePage 1.0 Controls/FluScrollablePage.qml -FluShadow 1.0 Controls/FluShadow.qml -FluSlider 1.0 Controls/FluSlider.qml -FluSpinBox 1.0 Controls/FluSpinBox.qml -FluStatusView 1.0 Controls/FluStatusView.qml -FluTabView 1.0 Controls/FluTabView.qml -FluTableModelColumn 1.0 Controls/FluTableModelColumn.qml -FluTableView 1.0 Controls/FluTableView.qml -FluText 1.0 Controls/FluText.qml -FluTextBox 1.0 Controls/FluTextBox.qml -FluTextBoxBackground 1.0 Controls/FluTextBoxBackground.qml -FluTextBoxMenu 1.0 Controls/FluTextBoxMenu.qml -FluTextButton 1.0 Controls/FluTextButton.qml -FluTimePicker 1.0 Controls/FluTimePicker.qml -FluToggleButton 1.0 Controls/FluToggleButton.qml -FluToggleSwitch 1.0 Controls/FluToggleSwitch.qml -FluTooltip 1.0 Controls/FluTooltip.qml -FluTour 1.0 Controls/FluTour.qml -FluTreeView 1.0 Controls/FluTreeView.qml -FluWindow 1.0 Controls/FluWindow.qml -plugin fluentuiplugin