Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16340 from RebeccaStankus/settingsApp

Browse source 
Moved position of settings app.
Something is up with the CLA but this is a valid PR
This commit is contained in:
Shannon Romano 2019-10-14 08:52:35 -07:00 committed by GitHub
commit 8f7f23480f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -160,6 +160,7 @@ var SETTINGS_APP_WINDOW_FLAGS = 0x00000001 | // Qt::Window
0x08000000 | // Qt::WindowCloseButtonHint 0x08000000 | // Qt::WindowCloseButtonHint
0x00008000 | // Qt::WindowMaximizeButtonHint 0x00008000 | // Qt::WindowMaximizeButtonHint
0x00004000; // Qt::WindowMinimizeButtonHint 0x00004000; // Qt::WindowMinimizeButtonHint
var SETTINGS_APP_RIGHT_MARGIN = 48;
var settingsAppWindow = false; var settingsAppWindow = false;
function toggleSettingsApp() { function toggleSettingsApp() {
if (settingsAppWindow) { if (settingsAppWindow) {
@ -179,7 +180,7 @@ function toggleSettingsApp() {
y: SETTINGS_APP_HEIGHT_PX y: SETTINGS_APP_HEIGHT_PX
}, },
position: { position: {
x: Math.max(Window.x + POPOUT_SAFE_MARGIN_X, Window.x + Window.innerWidth / 2 - SETTINGS_APP_WIDTH_PX / 2), x: Window.x + Window.innerWidth - SETTINGS_APP_WIDTH_PX - SETTINGS_APP_RIGHT_MARGIN,
y: Math.max(Window.y + POPOUT_SAFE_MARGIN_Y, Window.y + Window.innerHeight / 2 - SETTINGS_APP_HEIGHT_PX / 2) y: Math.max(Window.y + POPOUT_SAFE_MARGIN_Y, Window.y + Window.innerHeight / 2 - SETTINGS_APP_HEIGHT_PX / 2)
}, },
overrideFlags: SETTINGS_APP_WINDOW_FLAGS overrideFlags: SETTINGS_APP_WINDOW_FLAGS