Author: jtn
Date: Sat Dec 19 11:04:24 2015
New Revision: 31090

URL: http://svn.gna.org/viewcvs/freeciv?rev=31090&view=rev
Log:
In the city full bar on the main map, draw city size text as white or
black depending on the background (nation) colour.

'black' is defined in the tileset as a new item 'colors.mapview_citytext_dark'.

GUIs must implement a new function color_brightness_score(); in
principle this could take advantage of GUI-specific colourspace
functions, but all current implementations use a platform-independent
utility rgbcolor_brightness_score().

Invisibility of city size on yellow background in Qt client reported by
mir3x@gna.

See gna bug #24120.

Modified:
    trunk/client/colors_common.c
    trunk/client/colors_common.h
    trunk/client/gui-gtk-2.0/canvas.c
    trunk/client/gui-gtk-2.0/colors.c
    trunk/client/gui-gtk-3.0/canvas.c
    trunk/client/gui-gtk-3.0/colors.c
    trunk/client/gui-qt/colors.cpp
    trunk/client/gui-sdl2/colors.c
    trunk/client/gui-stub/colors.c
    trunk/client/include/colors_g.h
    trunk/client/mapview_common.c
    trunk/client/tilespec.c
    trunk/common/rgbcolor.c
    trunk/common/rgbcolor.h
    trunk/data/alio.tilespec
    trunk/data/amplio.tilespec
    trunk/data/amplio2.tilespec
    trunk/data/cimpletoon.tilespec
    trunk/data/hex2t.tilespec
    trunk/data/hexemplio.tilespec
    trunk/data/isophex.tilespec
    trunk/data/isotrident.tilespec
    trunk/data/misc/colors.tilespec
    trunk/data/toonhex.tilespec
    trunk/data/trident.tilespec
    trunk/utility/shared.h

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/client/colors_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/colors_common.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/colors_common.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/colors_common.h?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-gtk-2.0/canvas.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/canvas.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-gtk-2.0/colors.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/colors.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-gtk-3.0/canvas.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/canvas.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-gtk-3.0/colors.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/colors.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-qt/colors.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/colors.cpp?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-sdl2/colors.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/colors.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/gui-stub/colors.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/colors.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/include/colors_g.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/include/colors_g.h?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/mapview_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/mapview_common.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/common/rgbcolor.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/rgbcolor.c?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/common/rgbcolor.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/rgbcolor.h?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/alio.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alio.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/amplio.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/amplio2.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/cimpletoon.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/cimpletoon.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/hex2t.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/hexemplio.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/isophex.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/isophex.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/isotrident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/misc/colors.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/colors.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/toonhex.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/toonhex.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/data/trident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/trident.tilespec?rev=31090&r1=31089&r2=31090&view=diff

Modified: trunk/utility/shared.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.h?rev=31090&r1=31089&r2=31090&view=diff


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to