Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster

Browse source
This commit is contained in:
Zach Fox 2017-10-20 10:40:35 -07:00
commit c0ab320da6
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -19,7 +19,6 @@ Window {
shown: true shown: true
width: content.width width: content.width
height: content.height height: content.height
disableFade: true
// Disable this window from being able to call 'desktop.raise() and desktop.showDesktop' // Disable this window from being able to call 'desktop.raise() and desktop.showDesktop'
activator: Item {} activator: Item {}
property bool horizontal: true property bool horizontal: true
@ -127,7 +126,7 @@ Window {
sortButtons(); sortButtons();
shown = true; fadeIn(null);
return result; return result;
} }
@ -143,7 +142,7 @@ Window {
buttons.splice(index, 1); buttons.splice(index, 1);
if (buttons.length === 0) { if (buttons.length === 0) {
shown = false; fadeOut(null);
} }
} }
} }

7
interface/resources/qml/windows/Fadable.qml
View file

@ -36,9 +36,6 @@ FocusScope {
// Some dialogs should be destroyed when they become // Some dialogs should be destroyed when they become
// invisible, so handle that // invisible, so handle that
onVisibleChanged: { onVisibleChanged: {
if (disableFade) {
return;
}
// If someone directly set the visibility to false // If someone directly set the visibility to false
// toggle it back on and use the targetVisible flag to transition // toggle it back on and use the targetVisible flag to transition
// via fading. // via fading.
@ -66,9 +63,7 @@ FocusScope {
} }
onFadeTargetPropertyChanged: { onFadeTargetPropertyChanged: {
if (!disableFade) { visible = (fadeTargetProperty != 0.0);
visible = (fadeTargetProperty != 0.0);
}
} }
function fadeIn(callback) { function fadeIn(callback) {