Merge pull request #16624 from Ultimaker/CURA-10835_make_setting_hidden_icon

Icon is dragged into visible area
This commit is contained in:
Casper Lamboo 2023-09-01 15:50:56 +02:00 committed by GitHub
commit 6ef4758a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -20,6 +20,7 @@ Item
width: childrenRect.width; width: childrenRect.width;
height: childrenRect.height; height: childrenRect.height;
id: checkboxTooltipArea id: checkboxTooltipArea
x: check.height
UM.CheckBox UM.CheckBox
{ {
id: check id: check
@ -40,7 +41,7 @@ Item
{ {
width: height width: height
height: check.height height: check.height
anchors.left: checkboxTooltipArea.right anchors.right: checkboxTooltipArea.left
anchors.leftMargin: 2 * screenScaleFactor anchors.leftMargin: 2 * screenScaleFactor
text: text:
@ -82,7 +83,7 @@ Item
source: UM.Theme.getIcon("Information") source: UM.Theme.getIcon("Information")
color: UM.Theme.getColor("primary_button_text") color: UM.Theme.getColor("small_button_text")
} }
visible: provider.properties.enabled == "False" visible: provider.properties.enabled == "False"

View File

@ -40,7 +40,7 @@ Item
Cura.TextField Cura.TextField
{ {
id: filter id: filter
height: parent.height implicitHeight: parent.height
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
topPadding: height / 4 topPadding: height / 4
@ -337,7 +337,7 @@ Item
} }
function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) } function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) }
function onHideTooltip() { base.hideTooltip() } function onHideTooltip() { base.hideTooltip() }
function onShowAllHiddenInheritedSettings() function onShowAllHiddenInheritedSettings(category_id)
{ {
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id) var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
for(var i = 0; i < children_with_override.length; i++) for(var i = 0; i < children_with_override.length; i++)