marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ingame mouse cursor size configurable 

On High-DPI displays, the mouse cursor is very tiny. We'll probably want
some high-resolution cursor graphics at some point, but the current ones
scale good enough.
qteditor
Lukas Werling 2016-05-23 00:20:37 +02:00
parent 435fe98b71
commit a71ca69f1d
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config/C4Config.cpp
View File

@ -113,6 +113,7 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp)
pComp->Value(mkNamingAdapt(NoOffscreenBlits, "NoOffscreenBlits", 1 ));
pComp->Value(mkNamingAdapt(MultiSampling, "MultiSampling", 4 ));
pComp->Value(mkNamingAdapt(AutoFrameSkip, "AutoFrameSkip", 1 ));
pComp->Value(mkNamingAdapt(MouseCursorSize, "MouseCursorSize", 50 ));
}
void C4ConfigSound::CompileFunc(StdCompiler *pComp)

1
src/config/C4Config.h
View File

@ -115,6 +115,7 @@ public:
int32_t MultiSampling; // multisampling samples
int32_t AutoFrameSkip; // if true, gfx frames are skipped when they would slow down the game
int32_t DebugOpenGL; // if true, enables OpenGL debugging
int32_t MouseCursorSize; // size in pixels
void CompileFunc(StdCompiler *pComp);
};

33
src/gui/C4MouseControl.cpp
View File

@ -348,6 +348,11 @@ void C4MouseControl::DoMoveInput()
void C4MouseControl::Draw(C4TargetFacet &cgo, const ZoomData &GameZoom)
{
int32_t iOffsetX,iOffsetY;
float wdt = GfxR->fctMouseCursor.Wdt, hgt = GfxR->fctMouseCursor.Hgt;
// Cursor size relative to height - does not matter with current square graphics.
float zoom = Config.Graphics.MouseCursorSize / hgt;
hgt *= zoom;
wdt *= zoom;
ZoomData GuiZoom;
pDraw->GetZoom(&GuiZoom);
@ -367,19 +372,19 @@ void C4MouseControl::Draw(C4TargetFacet &cgo, const ZoomData &GameZoom)
//------------------------------------------------------------------------------------------
case C4MC_Drag_None: case C4MC_Drag_Script: case C4MC_Drag_Unhandled:
// Hotspot offset: Usually, hotspot is in center
iOffsetX = GfxR->fctMouseCursor.Wdt/2;
iOffsetY = GfxR->fctMouseCursor.Hgt/2;
iOffsetX = wdt/2;
iOffsetY = hgt/2;
// calculate the hotspot for the scrolling cursors
switch (Cursor)
{
case C4MC_Cursor_Up: iOffsetY += -GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_Down:iOffsetY += +GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_Left: iOffsetX += -GfxR->fctMouseCursor.Wdt/2; break;
case C4MC_Cursor_Right: iOffsetX += +GfxR->fctMouseCursor.Wdt/2; break;
case C4MC_Cursor_UpLeft: iOffsetX += -GfxR->fctMouseCursor.Wdt/2; iOffsetY += -GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_UpRight: iOffsetX += +GfxR->fctMouseCursor.Wdt/2; iOffsetY += -GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_DownLeft: iOffsetX += -GfxR->fctMouseCursor.Wdt/2; iOffsetY += +GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_DownRight: iOffsetX += +GfxR->fctMouseCursor.Wdt/2; iOffsetY += +GfxR->fctMouseCursor.Hgt/2; break;
case C4MC_Cursor_Up: iOffsetY += -hgt/2; break;
case C4MC_Cursor_Down:iOffsetY += +hgt/2; break;
case C4MC_Cursor_Left: iOffsetX += -wdt/2; break;
case C4MC_Cursor_Right: iOffsetX += +wdt/2; break;
case C4MC_Cursor_UpLeft: iOffsetX += -wdt/2; iOffsetY += -hgt/2; break;
case C4MC_Cursor_UpRight: iOffsetX += +wdt/2; iOffsetY += -hgt/2; break;
case C4MC_Cursor_DownLeft: iOffsetX += -wdt/2; iOffsetY += +hgt/2; break;
case C4MC_Cursor_DownRight: iOffsetX += +wdt/2; iOffsetY += +hgt/2; break;
}
// Drag image
if (DragImageObject || DragImageDef)
@ -462,12 +467,14 @@ void C4MouseControl::Draw(C4TargetFacet &cgo, const ZoomData &GameZoom)
if (fIsGameZoom) pDraw->SetZoom(GuiZoom);
// reset cursor hotspot offset for script drawing
iOffsetX = GfxR->fctMouseCursor.Wdt/2;
iOffsetY = GfxR->fctMouseCursor.Hgt/2;
iOffsetX = wdt/2;
iOffsetY = hgt/2;
}
// Cursor
if ( (!DragImageDef && !DragImageObject) || (Drag == C4MC_Drag_Script))
GfxR->fctMouseCursor.Draw(cgo.Surface,cgo.X+GuiX-iOffsetX,cgo.Y+GuiY-iOffsetY,Cursor);
{
GfxR->fctMouseCursor.DrawX(cgo.Surface, cgo.X+GuiX-iOffsetX, cgo.Y+GuiY-iOffsetY, wdt, hgt, Cursor);
}
break;
//------------------------------------------------------------------------------------------
}