Restore cursor doubling for "default" cursor.
This commit is contained in:
committed by
Matthias Mailänder
parent
f7e5111123
commit
370f7a44fa
@@ -188,7 +188,7 @@ namespace OpenRA.Graphics
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// Render cursor in software
|
// Render cursor in software
|
||||||
var doubleCursor = graphicSettings.CursorDouble && cursor.Name != "default";
|
var doubleCursor = graphicSettings.CursorDouble;
|
||||||
var cursorSprite = cursor.Sprites[frame % cursor.Length];
|
var cursorSprite = cursor.Sprites[frame % cursor.Length];
|
||||||
var cursorSize = doubleCursor ? 2.0f * cursorSprite.Size : cursorSprite.Size;
|
var cursorSize = doubleCursor ? 2.0f * cursorSprite.Size : cursorSprite.Size;
|
||||||
var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
|
var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
|
||||||
@@ -266,7 +266,7 @@ namespace OpenRA.Graphics
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Game.Renderer.Window.CreateHardwareCursor(name, new Size(newWidth, newHeight), rgbaData, hotspot, graphicSettings.CursorDouble && cursor.Name != "default");
|
return Game.Renderer.Window.CreateHardwareCursor(name, new Size(newWidth, newHeight), rgbaData, hotspot, graphicSettings.CursorDouble);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClearHardwareCursors()
|
void ClearHardwareCursors()
|
||||||
|
|||||||
@@ -131,13 +131,6 @@ Container@SETTINGS_PANEL:
|
|||||||
Height: 20
|
Height: 20
|
||||||
Font: Regular
|
Font: Regular
|
||||||
Text: Use Hardware Cursors
|
Text: Use Hardware Cursors
|
||||||
Checkbox@CURSORDOUBLE_CHECKBOX:
|
|
||||||
X: 310
|
|
||||||
Y: 75
|
|
||||||
Width: 200
|
|
||||||
Height: 20
|
|
||||||
Font: Regular
|
|
||||||
Text: Increase Command Cursor Size
|
|
||||||
Label@VIDEO_DESC:
|
Label@VIDEO_DESC:
|
||||||
Y: 97
|
Y: 97
|
||||||
Width: PARENT_RIGHT
|
Width: PARENT_RIGHT
|
||||||
@@ -225,6 +218,13 @@ Container@SETTINGS_PANEL:
|
|||||||
Width: 175
|
Width: 175
|
||||||
Height: 25
|
Height: 25
|
||||||
Font: Regular
|
Font: Regular
|
||||||
|
Checkbox@CURSORDOUBLE_CHECKBOX:
|
||||||
|
X: 15
|
||||||
|
Y: 243
|
||||||
|
Width: 200
|
||||||
|
Height: 20
|
||||||
|
Font: Regular
|
||||||
|
Text: Increase Cursor Size
|
||||||
Label@STATUS_BARS:
|
Label@STATUS_BARS:
|
||||||
X: 250
|
X: 250
|
||||||
Y: 240
|
Y: 240
|
||||||
|
|||||||
@@ -145,13 +145,6 @@ Background@SETTINGS_PANEL:
|
|||||||
Height: 20
|
Height: 20
|
||||||
Font: Regular
|
Font: Regular
|
||||||
Text: Use Hardware Cursors
|
Text: Use Hardware Cursors
|
||||||
Checkbox@CURSORDOUBLE_CHECKBOX:
|
|
||||||
X: 310
|
|
||||||
Y: 75
|
|
||||||
Width: 200
|
|
||||||
Height: 20
|
|
||||||
Font: Regular
|
|
||||||
Text: Increase Command Cursor Size
|
|
||||||
Label@VIDEO_DESC:
|
Label@VIDEO_DESC:
|
||||||
Y: 97
|
Y: 97
|
||||||
Width: PARENT_RIGHT
|
Width: PARENT_RIGHT
|
||||||
@@ -246,6 +239,13 @@ Background@SETTINGS_PANEL:
|
|||||||
Height: 25
|
Height: 25
|
||||||
Text: Status Bars:
|
Text: Status Bars:
|
||||||
Align: Right
|
Align: Right
|
||||||
|
Checkbox@CURSORDOUBLE_CHECKBOX:
|
||||||
|
X: 15
|
||||||
|
Y: 243
|
||||||
|
Width: 200
|
||||||
|
Height: 20
|
||||||
|
Font: Regular
|
||||||
|
Text: Increase Cursor Size
|
||||||
DropDownButton@STATUS_BAR_DROPDOWN:
|
DropDownButton@STATUS_BAR_DROPDOWN:
|
||||||
X: 400
|
X: 400
|
||||||
Y: 240
|
Y: 240
|
||||||
|
|||||||
Reference in New Issue
Block a user