GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 04:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Still show the inherit button even when the revert is visible

Browse Source 
It was not a bug like I assumed

Contributes to CURA-2752
This commit is contained in:
Arjen Hiemstra 2016-10-25 11:38:22 +02:00
parent e6c68bcdc9
commit bef3666a88
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/qml/Settings/SettingItem.qml
View File

@ -194,7 +194,6 @@ Item {
// Inherit button needs to be visible if; // Inherit button needs to be visible if;
// - User made changes that override any loaded settings // - User made changes that override any loaded settings
// - This setting item uses inherit button at all // - This setting item uses inherit button at all
// - The revert button is not visible.
// - The type of the value of any deeper container is an "object" (eg; is a function) // - The type of the value of any deeper container is an "object" (eg; is a function)
visible: visible:
{ {
@ -203,12 +202,6 @@ Item {
return false; return false;
} }
if(revertButton.visible)
{
// The revert button already indicates there is a custom value for this setting, making this button superfluous.
return false;
}
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1) if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{ {
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0; return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;