Author: jtn Date: Sat Dec 19 11:09:27 2015 New Revision: 31094 URL: http://svn.gna.org/viewcvs/freeciv?rev=31094&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: branches/S2_6/client/colors_common.c branches/S2_6/client/colors_common.h branches/S2_6/client/gui-gtk-2.0/canvas.c branches/S2_6/client/gui-gtk-2.0/colors.c branches/S2_6/client/gui-gtk-3.0/canvas.c branches/S2_6/client/gui-gtk-3.0/colors.c branches/S2_6/client/gui-qt/colors.cpp branches/S2_6/client/gui-sdl/colors.c branches/S2_6/client/gui-sdl2/colors.c branches/S2_6/client/gui-stub/colors.c branches/S2_6/client/gui-xaw/colors.c branches/S2_6/client/gui-xaw/mapview.c branches/S2_6/client/include/colors_g.h branches/S2_6/client/mapview_common.c branches/S2_6/client/tilespec.c branches/S2_6/common/rgbcolor.c branches/S2_6/common/rgbcolor.h branches/S2_6/data/alio.tilespec branches/S2_6/data/amplio.tilespec branches/S2_6/data/amplio2.tilespec branches/S2_6/data/cimpletoon.tilespec branches/S2_6/data/hex2t.tilespec branches/S2_6/data/hexemplio.tilespec branches/S2_6/data/isophex.tilespec branches/S2_6/data/isotrident.tilespec branches/S2_6/data/misc/colors.tilespec branches/S2_6/data/toonhex.tilespec branches/S2_6/data/trident.tilespec branches/S2_6/utility/shared.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/client/colors_common.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/colors_common.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/colors_common.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/colors_common.h?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-gtk-2.0/canvas.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/canvas.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-gtk-2.0/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/canvas.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/canvas.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-qt/colors.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/colors.cpp?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-sdl/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-sdl2/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-stub/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-stub/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-xaw/colors.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/colors.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/gui-xaw/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/mapview.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/include/colors_g.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/include/colors_g.h?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/mapview_common.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/mapview_common.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/common/rgbcolor.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/rgbcolor.c?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/common/rgbcolor.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/rgbcolor.h?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/alio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alio.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/amplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/cimpletoon.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/cimpletoon.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/hex2t.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hex2t.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/hexemplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/isophex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/isophex.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/isotrident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/isotrident.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/misc/colors.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/colors.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/toonhex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/toonhex.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/data/trident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/trident.tilespec?rev=31094&r1=31093&r2=31094&view=diff Modified: branches/S2_6/utility/shared.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.h?rev=31094&r1=31093&r2=31094&view=diff _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits