Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-07 14:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweaks to menu to have right position under Mac, always on, slightly smaller font

Browse source
This commit is contained in:
Philip Rosedale 2013-04-10 17:48:09 -07:00
parent 8b54b528c3
commit 859903274d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Menu.cpp
View file

@ -20,8 +20,9 @@ const int LINE_HEIGHT = 30;
const int MENU_HEIGHT = 30;
#ifdef _WIN32
const int MENU_Y_OFFSET = 8; // under windows we have 8 vertical pixels offset. In 2D an object with y=8, the object is displayed at y=0
// change the value in the other platforms (if required).
const int MENU_Y_OFFSET = 8; // under windows we have 8 vertical pixels offset.
// In 2D an object with y=8, the object is displayed at y=0
// change the value in the other platforms (if required).
#else
const int MENU_Y_OFFSET = 0;
#endif

2
interface/src/MenuColumn.cpp
View file

@ -128,7 +128,7 @@ void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) {
}
glEnd();
}
float scale = 0.10;
float scale = 0.09;
int mono = 0;
int y = menuHeight + lineHeight / 2 ;
char* rowName;

3
interface/src/main.cpp
View file

@ -179,7 +179,7 @@ int mouseStartX, mouseStartY; // Mouse location at start of last down click
int mousePressed = 0; // true if mouse has been pressed (clear when finished)
Menu menu; // main menu
int menuOn = 0; // Whether to show onscreen menu
int menuOn = 1; // Whether to show onscreen menu
//
// Serial USB Variables
@ -1094,7 +1094,6 @@ void key(unsigned char k, int x, int y)
#endif
}
// if (k == 'm') headMirror = !headMirror; // move in the menu
if (k == 'm') setMenu(-2);
if (k == 'f') displayField = !displayField;