Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 23:03:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some bugs

Browse source
This commit is contained in:
druiz17 2017-10-12 13:48:21 -07:00
parent a6bc6a09a5
commit 83d2a54b0f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,11 +302,12 @@ FocusScope {
for (var i = 0; i < desktop.visibleChildren.length; i++) { for (var i = 0; i < desktop.visibleChildren.length; i++) {
var child = desktop.visibleChildren[i]; var child = desktop.visibleChildren[i];
if (child.hasOwnProperty("modality")) { if (child.hasOwnProperty("modality")) {
var mappedPoint = child.mapFromGlobal(point.x, point.y); var mappedPoint = mapToItem(child, point.x, point.y);
if (child.hasOwnProperty("frame")) { if (child.hasOwnProperty("frame")) {
var outLine = child.frame.children[2]; var outLine = child.frame.children[2];
var framePoint = outLine.mapFromGlobal(point.x, point.y); var framePoint = outLine.mapFromGlobal(point.x, point.y);
if (child.contains(mappedPoint) || outLine.contains(framePoint)) { if (child.contains(mappedPoint) || outLine.contains(framePoint)) {
console.log("it should not be here");
return true; return true;
} }
} }

9
interface/src/ui/Stats.cpp
View file

@ -106,14 +106,15 @@ extern std::atomic<size_t> DECIMATED_TEXTURE_COUNT;
extern std::atomic<size_t> RECTIFIED_TEXTURE_COUNT; extern std::atomic<size_t> RECTIFIED_TEXTURE_COUNT;
void Stats::updateStats(bool force) { void Stats::updateStats(bool force) {
QQuickItem* parent = parentItem();
if (!force) { if (!force) {
if (!Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { if (!Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
if (isVisible()) { if (parent->isVisible()) {
setVisible(false); parent->setVisible(false);
} }
return; return;
} else if (!isVisible()) { } else if (!parent->isVisible()) {
setVisible(true); parent->setVisible(true);
} }
} }