Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust MFD sizes for better font scaling, force MFD lines to be right length.

Browse Source
This commit is contained in:
cim 2013-10-09 18:11:29 +01:00
parent d817df2576
commit 880c7294b2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Resources/Config/hud-small.plist
View File

@ -253,9 +253,9 @@
multi_function_displays = (
{
width = 174;
height = 134;
height = 116;
x = -100;
y = -72;
y = -62;
y_origin = 1;
}
);
@ -269,9 +269,9 @@
comm_log_gui = {
alpha = "0.75";
width = 180;
height = 140;
height = 120;
x = 100;
y = -72;
y = -62;
y_origin = 1;
row_height = 10;
permanent = no;

4
Resources/Config/hud.plist
View File

@ -317,14 +317,14 @@
);
multi_function_displays = (
{
width = 216;
width = 198;
height = 132;
x = -156;
y = -72;
y_origin = 1;
},
{
width = 216;
width = 198;
height = 132;
x = 156;
y = -72;

8
src/Core/HeadUpDisplay.m
View File

@ -2923,7 +2923,7 @@ static OOPolygonSprite *IconForMissileRole(NSString *role)
x = cached.x + [[UNIVERSE gameView] x_offset] * cached.x0;
y = cached.y + [[UNIVERSE gameView] y_offset] * cached.y0;
siz.width = useDefined(cached.width / 20, MFD_TEXT_WIDTH);
siz.width = useDefined(cached.width / 15, MFD_TEXT_WIDTH);
siz.height = useDefined(cached.height / 10, MFD_TEXT_HEIGHT);
GLfloat x0 = (GLfloat)(x - cached.width/2);
@ -2948,7 +2948,11 @@ static OOPolygonSprite *IconForMissileRole(NSString *role)
if (line != nil)
{
y0 -= siz.height;
OODrawString(line, x0, y0, z1, siz);
// all lines must be shorter than the size of the MFD
if (OORectFromString(line, 0.0f, 0.0f, siz).size.width <= cached.width)
{
OODrawString(line, x0, y0, z1, siz);
}
}
else
{