immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github:colobot/colobot into dev

dev-ui
erihel 2013-03-17 19:05:29 +01:00
parent d6bbc99c90 f88e74f887
commit e5aadfdaac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/maindialog.cpp
View File

@ -1880,7 +1880,7 @@ ddim.y = 150.0f/480.0f;
// TODO: #if !_DEMO // TODO: #if !_DEMO
pos.x = 40.0f/640.0f; pos.x = 40.0f/640.0f;
pos.y = 83.0f/480.0f; pos.y = 65.0f/480.0f;
ddim.x = 246.0f/640.0f; ddim.x = 246.0f/640.0f;
ddim.y = 16.0f/480.0f; ddim.y = 16.0f/480.0f;
GetResource(RES_TEXT, RT_GENERIC_DEV1, name); GetResource(RES_TEXT, RT_GENERIC_DEV1, name);
@ -1888,14 +1888,14 @@ ddim.y = 150.0f/480.0f;
pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontType(Gfx::FONT_COURIER);
pl->SetFontSize(8.0f); pl->SetFontSize(8.0f);
pos.y = 13.0f/480.0f; pos.y = 0.0f/480.0f;
GetResource(RES_TEXT, RT_GENERIC_DEV2, name); GetResource(RES_TEXT, RT_GENERIC_DEV2, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL2, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL2, name);
pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontType(Gfx::FONT_COURIER);
pl->SetFontSize(8.0f); pl->SetFontSize(8.0f);
pos.x = 355.0f/640.0f; pos.x = 355.0f/640.0f;
pos.y = 83.0f/480.0f; pos.y = 65.0f/480.0f;
ddim.x = 246.0f/640.0f; ddim.x = 246.0f/640.0f;
ddim.y = 16.0f/480.0f; ddim.y = 16.0f/480.0f;
GetResource(RES_TEXT, RT_GENERIC_EDIT1, name); GetResource(RES_TEXT, RT_GENERIC_EDIT1, name);
@ -1903,7 +1903,7 @@ ddim.y = 150.0f/480.0f;
pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontType(Gfx::FONT_COURIER);
pl->SetFontSize(8.0f); pl->SetFontSize(8.0f);
pos.y = 13.0f/480.0f; pos.y = 0.0f/480.0f;
GetResource(RES_TEXT, RT_GENERIC_EDIT2, name); GetResource(RES_TEXT, RT_GENERIC_EDIT2, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL4, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL4, name);
pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontType(Gfx::FONT_COURIER);