Fixed|libappfw: Apply UI scale factor; non-integer numbers in Variabl…

…eChoiceWidget
skyjake · Apr 5, 2016 · d97d851 · d97d851
1 parent 46c309a
commit d97d851
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doomsday/sdk/libappfw/src/baseguiapp.cpp b/doomsday/sdk/libappfw/src/baseguiapp.cpp
@@ -151,7 +151,7 @@ void BaseGuiApp::initSubsystems(SubsystemInitFlags flags)
     }
 
     // Apply the overall UI scale factor.
-    d->dpiFactor = config().getf("ui.scaleFactor", 1.f);
+    d->dpiFactor *= config().getf("ui.scaleFactor", 1.f);
 
     scriptSystem().nativeModule("DisplayMode").set("DPI_FACTOR", d->dpiFactor);
 

diff --git a/doomsday/sdk/libappfw/src/widgets/variablechoicewidget.cpp b/doomsday/sdk/libappfw/src/widgets/variablechoicewidget.cpp
@@ -13,7 +13,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "de/VariableChoiceWidget"
@@ -58,7 +58,7 @@ DENG2_OBSERVES(Variable, Change  )
         if(!var) return;
 
         var->audienceForChange() -= this;
-        var->set(NumberValue(self.selectedItem().data().toInt()));
+        var->set(NumberValue(self.selectedItem().data().toDouble()));
         var->audienceForChange() += this;
     }