Merge branch 'master' of https://github.com/worklist/hifi into modelserver

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.floor(Math.log(scale) / Math.log(2));
         rescaleImport();
+        this.update();
     }
     
     this.show = function(doShow) {
@@ -835,7 +836,6 @@ function showPreviewLines() {
         
         if (copyScale) {
             scaleSelector.setScale(intersection.voxel.s);
-            scaleSelector.update();
         }
         moveTools();
     } else {

interface/src/MainWindow.cpp

@@ -10,6 +10,7 @@
 //
 
 #include "MainWindow.h"
+#include "Menu.h"
 
 #include <QEvent>
 #include <QMoveEvent>
@@ -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);

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);
 }
 

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);