Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix a bunch of bugs in qml window placement

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-25 20:19:54 -07:00
parent 6dfd174285
commit 4ab7b660d4
9 changed files with 134 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/AssetServer.qml
View file

@ -24,7 +24,6 @@ Window {
title: "Asset Browser"
resizable: true
destroyOnInvisible: true
x: 40; y: 40
implicitWidth: 384; implicitHeight: 640
minSize: Qt.vector2d(200, 300)

2
interface/resources/qml/AvatarInputs.qml
View file

@ -25,7 +25,7 @@ Hifi.AvatarInputs {
readonly property int iconPadding: 5
readonly property bool shouldReposition: true
Settings {
category: "Overlay.AvatarInputs"
property alias x: root.x

18
interface/resources/qml/InfoView.qml
View file

@ -22,4 +22,22 @@ Windows.Window {
url: infoView.url
}
}
Component.onCompleted: {
//console.log("InfoView.Component.onCompleted");
centerWindow(root);
}
onVisibleChanged: {
if (visible) {
centerWindow(root);
}
}
function centerWindow() {
//console.log("InfoView.Component.centerWindow");
desktop.centerOnVisible(root);
}
}

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

@ -21,7 +21,8 @@ FocusScope {
objectName: "desktop"
anchors.fill: parent
property rect recommendedRect: rect(0,0,0,0);
property rect recommendedRect: Qt.rect(0,0,0,0);
property var expectedChildren;
onHeightChanged: d.handleSizeChanged();
@ -55,14 +56,28 @@ FocusScope {
function handleSizeChanged() {
var oldRecommendedRect = recommendedRect;
var newRecommendedRectJS = Controller.getRecommendedOverlayRect();
var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect();
var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
newRecommendedRectJS.width,
newRecommendedRectJS.height);
if (oldRecommendedRect != Qt.rect(0,0,0,0)
&& oldRecommendedRect != newRecommendedRect) {
var oldChildren = expectedChildren;
var newChildren = d.getRepositionChildren();
//console.log("handleSizeChanged() - oldChildren:" + oldChildren);
//console.log("handleSizeChanged() - newChildren:" + newChildren);
//console.log("handleSizeChanged() - oldRecommendedRect:" + oldRecommendedRect);
//console.log("handleSizeChanged() - newRecommendedRect:" + newRecommendedRect);
if (oldRecommendedRect != Qt.rect(0,0,0,0)
&& (oldRecommendedRect != newRecommendedRect
|| oldChildren != newChildren)
) {
expectedChildren = newChildren;
//console.log("handleSizeChanged() - calling repositionAll()");
d.repositionAll();
} else {
//console.log("handleSizeChanged() - DID NOT CALL repositionAll()");
}
recommendedRect = newRecommendedRect;
}
@ -244,6 +259,7 @@ FocusScope {
for (var i = 0; i < windows.length; ++i) {
var targetWindow = windows[i];
if (targetWindow.visible) {
//console.log("repositionAll() about to repositionWindow() targetWindow:" + targetWindow);
repositionWindow(targetWindow, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
}
}
@ -252,6 +268,7 @@ FocusScope {
var otherChildren = d.getRepositionChildren();
for (var i = 0; i < otherChildren.length; ++i) {
var child = otherChildren[i];
//console.log("repositionAll() about to repositionWindow() child:" + child);
repositionWindow(child, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
}
@ -279,13 +296,66 @@ FocusScope {
targetWindow.focus = true;
}
showDesktop();
}
function centerOnVisible(item) {
//console.log("centerOnVisible() item:" + item);
var targetWindow = d.getDesktopWindow(item);
//console.log("centerOnVisible() targetWindow:" + targetWindow );
if (!targetWindow) {
console.warn("Could not find top level window for " + item);
return;
}
if (typeof Controller === "undefined") {
console.warn("Controller not yet available... can't center");
return;
}
var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect();
var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
newRecommendedRectJS.width,
newRecommendedRectJS.height);
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
var newX = newRecommendedRect.x + ((newRecommendedRect.width - targetWindow.width) / 2);
var newY = newRecommendedRect.y + ((newRecommendedRect.height - targetWindow.height) / 2);
//console.log("centerOnVisible() newRecommendedRect:" + newRecommendedRect.x + "," + newRecommendedRect.y + "/" + newRecommendedRect.width + "x" + newRecommendedRect.height);
//console.log("centerOnVisible() newX/newY:" + newX + "," + newY);
targetWindow.x = newX;
targetWindow.y = newY;
if (recommendedRect != newRecommendedRect) {
//console.log("centerOnVisible() -- detected new recommended rect");
//console.log("old recommendedRect:" + recommendedRect);
//console.log("newRecommendedRect:" + newRecommendedRect);
recommendedRect = newRecommendedRect;
}
}
function repositionOnVisible(item) {
console.warn("repositionOnVisible() item:" + item);
var targetWindow = d.getDesktopWindow(item);
console.warn("repositionOnVisible() targetWindow:" + targetWindow);
if (!targetWindow) {
console.warn("Could not find top level window for " + item);
return;
}
if (typeof Controller === "undefined") {
console.warn("Controller not yet available... can't reposition targetWindow:" + targetWindow);
return;
}
var oldRecommendedRect = recommendedRect;
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);
showDesktop();
}
function repositionWindow(targetWindow, forceReposition,
@ -324,10 +394,15 @@ FocusScope {
}
var fractionX = Utils.clamp(originRelativeX / oldRecommendedDimmensions.x, 0, 1);
var fractionY = Utils.clamp(originRelativeY / oldRecommendedDimmensions.y, 0, 1);
var newX = (fractionX * newRecommendedDimmensions.x) + newRecommendedRect.x;
var newY = (fractionY * newRecommendedDimmensions.y) + newRecommendedRect.y;
//console.log("repositionWindow() oldRecommendedRect:" + oldRecommendedRect.x + "," + oldRecommendedRect.y + "/" + oldRecommendedRect.width + "x" + oldRecommendedRect.height);
//console.log("repositionWindow() newRecommendedRect:" + newRecommendedRect.x + "," + newRecommendedRect.y + "/" + newRecommendedRect.width + "x" + newRecommendedRect.height);
//console.log("repositionWindow() originRelativeX/originRelativeY:" + originRelativeX + "," + originRelativeY);
//console.log("repositionWindow() fractionX/fractionY:" + fractionX + "," + fractionY);
//console.log("repositionWindow() newX/newY:" + newX + "," + newY);
newPosition = Qt.vector2d(newX, newY);
}
targetWindow.x = newPosition.x;

1
interface/resources/qml/hifi/dialogs/RunningScripts.qml
View file

@ -23,7 +23,6 @@ Window {
title: "Running Scripts"
resizable: true
destroyOnInvisible: true
x: 40; y: 40
implicitWidth: 400
implicitHeight: isHMD ? 695 : 728
minSize: Qt.vector2d(200, 300)

16
interface/resources/qml/windows-uit/Window.qml
View file

@ -31,7 +31,7 @@ Fadable {
// decorations can extend outside it.
implicitHeight: content ? content.height : 0
implicitWidth: content ? content.width : 0
x: -1; y: -1
x: -9999; y: -9999
enabled: visible
signal windowDestroyed();
@ -249,9 +249,11 @@ Fadable {
children: [ swallower, frame, pane, activator ]
Component.onCompleted: {
//console.log("Window(uit).Component.onCompleted window:" + window);
window.parentChanged.connect(raise);
raise();
setDefaultFocus();
centerOrReposition();
}
Component.onDestruction: {
window.parentChanged.disconnect(raise); // Prevent warning on shutdown
@ -267,6 +269,18 @@ Fadable {
raise();
}
enabled = visible
if (visible && parent) {
centerOrReposition();
}
}
function centerOrReposition() {
if (x == -9999 && y == -9999) {
desktop.centerOnVisible(window);
} else {
desktop.repositionOnVisible(window);
}
}
function raise() {

16
interface/resources/qml/windows/Window.qml
View file

@ -19,7 +19,7 @@ Fadable {
// decorations can extend outside it.
implicitHeight: content ? content.height : 0
implicitWidth: content ? content.width : 0
x: -1; y: -1
x: -9999; y: -9999
enabled: visible
signal windowDestroyed();
@ -115,14 +115,24 @@ Fadable {
children: [ swallower, frame, content, activator ]
Component.onCompleted: {
//console.log("Window(uit).Component.onCompleted window:" + window);
window.parentChanged.connect(raise);
raise();
centerOrReposition();
}
Component.onDestruction: {
window.parentChanged.disconnect(raise); // Prevent warning on shutdown
windowDestroyed();
}
function centerOrReposition() {
if (x == -9999 && y == -9999) {
desktop.centerOnVisible(window);
} else {
desktop.repositionOnVisible(window);
}
}
onVisibleChanged: {
if (!visible && destroyOnInvisible) {
destroy();
@ -132,6 +142,10 @@ Fadable {
raise();
}
enabled = visible
if (visible && parent) {
centerOrReposition();
}
}
function raise() {

1
interface/src/Application.cpp
View file

@ -4315,6 +4315,7 @@ void Application::nodeKilled(SharedNodePointer node) {
}
}
}
void Application::trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket) {
// Attempt to identify the sender from its address.
if (sendingNode) {

3
libraries/plugins/src/plugins/DisplayPlugin.h
View file

@ -107,7 +107,8 @@ public:
// The recommended bounds for primary overlay placement
virtual QRect getRecommendedOverlayRect() const {
auto recommendedSize = getRecommendedUiSize();
const int DESKTOP_SCREEN_PADDING = 50;
auto recommendedSize = getRecommendedUiSize() - glm::uvec2(DESKTOP_SCREEN_PADDING);
return QRect(0, 0, recommendedSize.x, recommendedSize.y);
}