mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-21 05:37:50 -06:00
Dropdown menu wasn't closing on MacOS.
CURA-8172
This commit is contained in:
parent
6f59473971
commit
e0e77327b5
2 changed files with 25 additions and 19 deletions
|
@ -1,14 +1,17 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Copyright (c) 2021 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQml.Models 2.15 as Models
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Menu
|
||||
{
|
||||
ActionGroup { id: group }
|
||||
|
||||
id: menu
|
||||
title: catalog.i18nc("@action:inmenu", "Visible Settings")
|
||||
|
||||
|
@ -16,7 +19,7 @@ Menu
|
|||
|
||||
signal collapseAllCategories()
|
||||
|
||||
Instantiator
|
||||
Models.Instantiator
|
||||
{
|
||||
model: settingVisibilityPresetsModel.items
|
||||
|
||||
|
@ -25,7 +28,7 @@ Menu
|
|||
text: modelData.name
|
||||
checkable: true
|
||||
checked: modelData.presetId == settingVisibilityPresetsModel.activePreset
|
||||
exclusiveGroup: group
|
||||
ActionGroup.group: group
|
||||
onTriggered:
|
||||
{
|
||||
settingVisibilityPresetsModel.setActivePreset(modelData.presetId);
|
||||
|
@ -49,9 +52,7 @@ Menu
|
|||
MenuItem
|
||||
{
|
||||
text: catalog.i18nc("@action:inmenu", "Manage Setting Visibility...")
|
||||
iconName: "configure"
|
||||
icon.name: "configure"
|
||||
onTriggered: Cura.Actions.configureSettingVisibility.trigger()
|
||||
}
|
||||
|
||||
ExclusiveGroup { id: group }
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Copyright (c) 2021 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
|
@ -154,6 +154,20 @@ Item
|
|||
}
|
||||
}
|
||||
|
||||
SettingVisibilityPresetsMenu
|
||||
{
|
||||
id: settingVisibilityPresetsMenu
|
||||
x: settingVisibilityMenu.x
|
||||
y: settingVisibilityMenu.y
|
||||
onCollapseAllCategories:
|
||||
{
|
||||
settingsSearchTimer.stop()
|
||||
filter.text = "" // clear search field
|
||||
filter.editingFinished()
|
||||
definitionsModel.collapseAllCategories()
|
||||
}
|
||||
}
|
||||
|
||||
ToolButton
|
||||
{
|
||||
id: settingVisibilityMenu
|
||||
|
@ -185,16 +199,7 @@ Item
|
|||
label: Label {}
|
||||
}
|
||||
|
||||
menu: SettingVisibilityPresetsMenu
|
||||
{
|
||||
onCollapseAllCategories:
|
||||
{
|
||||
settingsSearchTimer.stop()
|
||||
filter.text = "" // clear search field
|
||||
filter.editingFinished()
|
||||
definitionsModel.collapseAllCategories()
|
||||
}
|
||||
}
|
||||
onClicked: settingVisibilityPresetsMenu.open()
|
||||
}
|
||||
|
||||
// Mouse area that gathers the scroll events to not propagate it to the main view.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue