dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-04 00:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support "scaleto43 0" in Desktop windowDefs to explicitly stretch them

Browse source 
even if r_scaleMenusTo43 1 and they'd usually be scaled to 4:3.
Useful when using anchors in fullscreen menus (like the PDA)

This is analogous to "scaleto43 1" in windowDefs which allows scaling
to 4:3 (with black/empty bars) even if by default it would *not* be
scaled.
This commit is contained in:
Daniel Gibson 2025-02-17 03:42:50 +01:00
parent a18b9e6bad
commit c30bff8c67
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neo/ui/UserInterface.cpp
View file

@ -563,13 +563,19 @@ void idUserInterfaceLocal::StateChanged( int _time, bool redraw ) {
// DG: little hack: allow game DLLs to do
// ui->SetStateBool("scaleto43", true);
// ui->StateChanged(gameLocal.time);
// so we can force cursors.gui (crosshair) to be scaled, for example
bool scaleTo43 = false;
if(state.GetBool("scaleto43", "0", scaleTo43)) {
if(scaleTo43)
// so we can force cursors.gui (crosshair) to be scaled, for example.
// Not sure if/where that's needed, but ui->SetStateBool("scaleto43", false);
// is now also supported to explicitly disable scaling from the code
int scaleTo43 = 0;
if(state.GetInt("scaleto43", "-1", scaleTo43)) {
if(scaleTo43 > 0) {
desktop->SetFlag(WIN_SCALETO43);
else
desktop->ClearFlag(WIN_NO_SCALETO43);
// TODO
} else if(scaleTo43 == 0) {
desktop->ClearFlag(WIN_SCALETO43);
desktop->SetFlag(WIN_NO_SCALETO43);
} // do nothing for -1, it means that it wasn't set at all
}
// DG end

7
neo/ui/Window.cpp
View file

@ -1238,7 +1238,7 @@ void idWindow::Redraw(float x, float y) {
// only scale desktop windows (will automatically scale its sub-windows)
// that EITHER have the scaleto43 flag set OR are fullscreen menus and r_scaleMenusTo43 is 1
if( (flags & WIN_SCALETO43) ||
((flags & WIN_MENUGUI) && r_scaleMenusTo43.GetBool()) )
( (flags & WIN_MENUGUI) && r_scaleMenusTo43.GetBool() && !(flags & WIN_NO_SCALETO43) ) )
{
fixupFor43 = true;
dc->SetMenuScaleFix(true);
@ -2028,8 +2028,11 @@ bool idWindow::ParseInternalVar(const char *_name, idParser *src) {
// DG: added this window flag for Windows that should be scaled to 4:3
// (with "empty" bars left/right or above/below)
if (idStr::Icmp(_name, "scaleto43") == 0) {
if ( src->ParseBool() ) {
int scaleTo43 = src->ParseInt();
if(scaleTo43 > 0) {
flags |= WIN_SCALETO43;
} else if(scaleTo43 == 0) {
flags |= WIN_NO_SCALETO43;
}
return true;
}

6
neo/ui/Window.h
View file

@ -65,7 +65,11 @@ const int WIN_WANTENTER = 0x01000000;
const int WIN_DESKTOP = 0x10000000;
const int WIN_SCALETO43 = 0x20000000; // DG: for the "scaleto43" window flag (=> scale window to 4:3 with "empty" bars left/right or above/below)
// DG: for the "scaleto43" window flag (=> scale window to 4:3 with "empty" bars left/right or above/below)
const int WIN_SCALETO43 = 0x20000000;
// DG: if a gui explicitly wants to be stretched despite r_scaleMenusTo43 1 it can set `scaleto43 0`
// (useful when using anchors in fullscreen menus)
const int WIN_NO_SCALETO43 = 0x40000000;
const char CAPTION_HEIGHT[] = "16.0";
const char SCROLLER_SIZE[] = "16.0";