upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 17:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide and disable color cursors option on Mac OS X (bug #18112)

Browse Source 
It is known to cause severe lags that may render the cursor completely
unusable at times. This probably won't be solved until Wesnoth can run
on SDL 2.0.
This commit is contained in:
Ignacio R. Morelle 2013-12-17 20:28:53 -03:00
parent e512b72fc8
commit d15745ea25
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -33,6 +33,8 @@ Version 1.11.7+dev:
all human player slots have been taken. all human player slots have been taken.
* Change layout for advertized games in the MP lobby and add map icon. * Change layout for advertized games in the MP lobby and add map icon.
* Moved color cursors option to Advanced Preferences. * Moved color cursors option to Advanced Preferences.
* Always hide and disable color cursors option on Mac OS X since it's known
to cause severe lags that render the cursor unusable.
* WML engine: * WML engine:
* WML variable turn_number is set correctly (to 1) in prestart and start * WML variable turn_number is set correctly (to 1) in prestart and start
events. Previously, it retained its last value from the previous scenario events. Previously, it retained its last value from the previous scenario

2
data/advanced_preferences.cfg
View File

@ -174,6 +174,7 @@
default=no default=no
[/advanced_preference] [/advanced_preference]
#ifndef APPLE
[advanced_preference] [advanced_preference]
field=color_cursors field=color_cursors
name= _ "Show color cursors" name= _ "Show color cursors"
@ -181,6 +182,7 @@
type=boolean type=boolean
default=no default=no
[/advanced_preference] [/advanced_preference]
#endif
#ifdef __UNUSED__ #ifdef __UNUSED__
[advanced_preference] [advanced_preference]

6
src/cursor.cpp
View File

@ -28,7 +28,13 @@
static bool use_color_cursors() static bool use_color_cursors()
{ {
#ifdef __APPLE__
// Color cursors on OS X are known to be unusable, so don't use them ever.
// See bug #18112.
return false;
#else
return game_config::editor == false && preferences::use_color_cursors(); return game_config::editor == false && preferences::use_color_cursors();
#endif
} }
static SDL_Cursor* create_cursor(surface surf) static SDL_Cursor* create_cursor(surface surf)