add ui and viewport scale option, fix combobox items height from parent

This commit is contained in:
2019-08-04 12:00:49 +02:00
parent a1436eec4a
commit cc087746bd
10 changed files with 107 additions and 39 deletions

View File

@@ -34,6 +34,7 @@
#include "asset.h"
#include "keymap.h"
#include "main.h"
#include "settings.h"
#include "com_omixlab_panopainter_MainActivity.h"
#ifdef __QUEST__
@@ -692,6 +693,9 @@ static int engine_init_display(struct engine* engine) {
#ifdef __QUEST__
App::I->zoom = 1.f;
if (Settings::has("ui-scale"))
App::I->zoom = Settings::value<Serializer::Float>("ui-scale");
App::I->width = 1024;
App::I->height = 1024;
App::I->redraw = true;
@@ -714,8 +718,9 @@ static int engine_init_display(struct engine* engine) {
engine_start_vr_thread();
#else
float density = get_display_density();
App::I->zoom = Settings::value_or<Serializer::Float>("ui-scale", density / 1.5f);
App::I->display_density = density;
LOG("density %f", density);
App::I->zoom = density / 1.5;
App::I->width = w;
App::I->height = h;
App::I->redraw = true;