diff --git a/changelog b/changelog index 2822f1ab181..969f9c73d72 100644 --- a/changelog +++ b/changelog @@ -33,6 +33,8 @@ Version 1.11.7+dev: all human player slots have been taken. * Change layout for advertized games in the MP lobby and add map icon. * 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 variable turn_number is set correctly (to 1) in prestart and start events. Previously, it retained its last value from the previous scenario diff --git a/data/advanced_preferences.cfg b/data/advanced_preferences.cfg index 56d42a62bd7..61bdab7f071 100644 --- a/data/advanced_preferences.cfg +++ b/data/advanced_preferences.cfg @@ -174,6 +174,7 @@ default=no [/advanced_preference] +#ifndef APPLE [advanced_preference] field=color_cursors name= _ "Show color cursors" @@ -181,6 +182,7 @@ type=boolean default=no [/advanced_preference] +#endif #ifdef __UNUSED__ [advanced_preference] diff --git a/src/cursor.cpp b/src/cursor.cpp index 51782d16d5b..a2d06e39ae0 100644 --- a/src/cursor.cpp +++ b/src/cursor.cpp @@ -28,7 +28,13 @@ 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(); +#endif } static SDL_Cursor* create_cursor(surface surf)