From 7f7cd6f65463b8de3fc917d3981917cd85b2a21a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 5 May 2014 11:15:55 -0700 Subject: [PATCH 1/4] Fix for OS X Fullscreen (closes #2414) --- interface/src/MainWindow.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/src/MainWindow.cpp b/interface/src/MainWindow.cpp index 7fddbfffa3..3c2f4a7ca4 100644 --- a/interface/src/MainWindow.cpp +++ b/interface/src/MainWindow.cpp @@ -10,6 +10,7 @@ // #include "MainWindow.h" +#include "Menu.h" #include #include @@ -56,6 +57,10 @@ void MainWindow::changeEvent(QEvent* event) { } else { emit windowShown(true); } + + if (isFullScreen() != Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen)) { + Menu::getInstance()->setIsOptionChecked(MenuOption::Fullscreen, isFullScreen()); + } } else if (event->type() == QEvent::ActivationChange) { if (isActiveWindow()) { emit windowShown(true); From 31b5c39f167f8a12f1334633c26245eb2411b2ae Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 5 May 2014 11:17:11 -0700 Subject: [PATCH 2/4] Fix warnings --- interface/src/ui/ScriptLineNumberArea.cpp | 2 +- interface/src/ui/ScriptLineNumberArea.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/ScriptLineNumberArea.cpp b/interface/src/ui/ScriptLineNumberArea.cpp index 9173c72375..5bb08918b9 100644 --- a/interface/src/ui/ScriptLineNumberArea.cpp +++ b/interface/src/ui/ScriptLineNumberArea.cpp @@ -19,7 +19,7 @@ ScriptLineNumberArea::ScriptLineNumberArea(ScriptEditBox* scriptEditBox) : _scriptEditBox = scriptEditBox; } -QSize ScriptLineNumberArea::sizeHint() { +QSize ScriptLineNumberArea::sizeHint() const { return QSize(_scriptEditBox->lineNumberAreaWidth(), 0); } diff --git a/interface/src/ui/ScriptLineNumberArea.h b/interface/src/ui/ScriptLineNumberArea.h index 75be2048f0..47c540ca0e 100644 --- a/interface/src/ui/ScriptLineNumberArea.h +++ b/interface/src/ui/ScriptLineNumberArea.h @@ -19,7 +19,7 @@ class ScriptLineNumberArea : public QWidget { public: ScriptLineNumberArea(ScriptEditBox* scriptEditBox); - QSize sizeHint(); + QSize sizeHint() const; protected: void paintEvent(QPaintEvent* event); From 7855bf8e2434eca94d3a7b3d9c9e0396378d3d71 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 5 May 2014 11:35:50 -0700 Subject: [PATCH 3/4] Fix scale issue in editVoxels.js (closes #2776) --- examples/editVoxels.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/editVoxels.js b/examples/editVoxels.js index 453ac28649..8e85341e83 100644 --- a/examples/editVoxels.js +++ b/examples/editVoxels.js @@ -331,8 +331,9 @@ function ScaleSelector() { }); this.setScale = function(scale) { this.scale = scale; - this.power = Math.floor(Math.log(scale)); + this.power = Math.ceil(Math.log(scale) * Math.LOG2E); rescaleImport(); + this.update(); } this.show = function(doShow) { @@ -835,7 +836,6 @@ function showPreviewLines() { if (copyScale) { scaleSelector.setScale(intersection.voxel.s); - scaleSelector.update(); } moveTools(); } else { From 1ecf0e3b9d3f4b019163cd3ba95254477c8205da Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 5 May 2014 11:43:58 -0700 Subject: [PATCH 4/4] Used wrong formula in previous commit --- examples/editVoxels.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/editVoxels.js b/examples/editVoxels.js index 8e85341e83..b9f5d925d9 100644 --- a/examples/editVoxels.js +++ b/examples/editVoxels.js @@ -331,7 +331,7 @@ function ScaleSelector() { }); this.setScale = function(scale) { this.scale = scale; - this.power = Math.ceil(Math.log(scale) * Math.LOG2E); + this.power = Math.floor(Math.log(scale) / Math.log(2)); rescaleImport(); this.update(); }