Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 12:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix qml to work with rect instead of vec4

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-16 17:29:03 -07:00
parent 8f3d48190a
commit b62f1a135d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/qml/desktop/Desktop.qml
View file

@ -21,7 +21,7 @@ FocusScope {
objectName: "desktop"
anchors.fill: parent
property vector4d recommendedRect: vector4d(0,0,0,0);
property rect recommendedRect: rect(0,0,0,0);
onHeightChanged: d.handleSizeChanged();
@ -56,10 +56,11 @@ FocusScope {
function handleSizeChanged() {
var oldRecommendedRect = recommendedRect;
var newRecommendedRectJS = Controller.getRecommendedOverlayRect();
var newRecommendedRect = Qt.vector4d(newRecommendedRectJS.x, newRecommendedRectJS.y,
newRecommendedRectJS.x + newRecommendedRectJS.width,
newRecommendedRectJS.y + newRecommendedRectJS.height);
if (oldRecommendedRect != Qt.vector4d(0,0,0,0)
var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
newRecommendedRectJS.width,
newRecommendedRectJS.height);
if (oldRecommendedRect != Qt.rect(0,0,0,0)
&& oldRecommendedRect != newRecommendedRect) {
d.repositionAll();
}
@ -237,10 +238,9 @@ FocusScope {
function repositionAll() {
var oldRecommendedRect = recommendedRect;
var oldRecommendedDimmensions = { x: oldRecommendedRect.z - oldRecommendedRect.x, y: oldRecommendedRect.w - oldRecommendedRect.y };
var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
var newRecommendedRect = Controller.getRecommendedOverlayRect();
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
var windows = d.getTopLevelWindows();
for (var i = 0; i < windows.length; ++i) {
var targetWindow = windows[i];
@ -279,7 +279,7 @@ FocusScope {
}
var oldRecommendedRect = recommendedRect;
var oldRecommendedDimmensions = { x: oldRecommendedRect.z - oldRecommendedRect.x, y: oldRecommendedRect.w - oldRecommendedRect.y };
var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
var newRecommendedRect = Controller.getRecommendedOverlayRect();
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
repositionWindow(targetWindow, false, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);