Added very slight shadow to most UI texts, making them more readable

Modules can enable text shadows on the UI by doing: require("engine.ui.Base"):setTextShadow(0.6)


git-svn-id: http://svn.net-core.org/repos/t-engine4@3324 51575b47-30f0-44d4-a5cc-537603b46e54

@@ -153,3 +153,7 @@ function _M:drawFrame(f, x, y, r, g, b, a)
 	f.b9.t:toScreenFull(x + f.w - f.b9.w, y, f.b9.w, f.b9.h, f.b9.tw, f.b9.th, r, g, b, a)
 	f.b3.t:toScreenFull(x + f.w - f.b3.w, y + f.h - f.b3.h, f.b3.w, f.b3.h, f.b3.tw, f.b3.th, r, g, b, a)
 end
+
+function _M:setTextShadow(v)
+	self.text_shadow = v
+end

@@ -74,10 +74,8 @@ function _M:display(x, y, nb_keyframes, ox, oy)
 	if self.focused then
 			if button == 1 and mx > ox and mx < ox+self.w and my > oy and my < oy+self.h then
 				self:drawFrame(self.frame, x, y, 0, 1, 0, 1)
-				self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 			else
 				self:drawFrame(self.frame_sel, x, y)
-				self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 			end
 	else
 		self:drawFrame(self.frame, x, y)
@@ -86,6 +84,7 @@ function _M:display(x, y, nb_keyframes, ox, oy)
 			self.focus_decay = self.focus_decay - nb_keyframes
 			if self.focus_decay <= 0 then self.focus_decay = nil end
 		end
-		self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 	end
+	if self.text_shadow then self.tex[1]:toScreenFull(x-frame_ox1+1, y-frame_oy1+1, self.rw, self.rh, self.tex[2], self.tex[3], 0, 0, 0, self.text_shadow) end
+	self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 end

@@ -69,6 +69,7 @@ function _M:select()
 end
 
 function _M:display(x, y, nb_keyframes)
+	if self.text_shadow then self.tex[1]:toScreenFull(x+1, y+1 + (self.h - self.title_h) / 2, self.title_w, self.title_h, self.tex[2], self.tex[3], 0, 0, 0, self.text_shadow) end
 	self.tex[1]:toScreenFull(x, y + (self.h - self.title_h) / 2, self.title_w, self.title_h, self.tex[2], self.tex[3])
 	if self.focused then
 		self.check.t:toScreenFull(x + self.title_w, y, self.check.w, self.check.h, self.check.tw, self.check.th)

@@ -168,6 +168,7 @@ function _M:display(x, y, nb_keyframes)
 				if item.focus_decay <= 0 then item.focus_decay = nil end
 			end
 		end
+		if self.text_shadow then item._tex[1]:toScreenFull(x+1 + self.frame_sel.b4.w, y+1, self.fw, self.fh, item._tex[2], item._tex[3], 0, 0, 0, self.text_shadow) end
 		item._tex[1]:toScreenFull(x + self.frame_sel.b4.w, y, self.fw, self.fh, item._tex[2], item._tex[3])
 		y = y + self.fh
 	end

@@ -270,6 +270,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 			if col.direct_draw then
 				col.direct_draw(item, x, y, col.fw, self.fh)
 			else
+				if self.text_shadow then item._tex[j][1]:toScreenFull(x+1, y+1, col.fw, self.fh, item._tex[j][2], item._tex[j][3], 0, 0, 0, self.text_shadow) end
 				item._tex[j][1]:toScreenFull(x, y, col.fw, self.fh, item._tex[j][2], item._tex[j][3])
 			end
 			item.last_display_x = screen_x + (x - bx)

@@ -151,6 +151,7 @@ function _M:updateText(v)
 end
 
 function _M:display(x, y, nb_keyframes)
+	if self.text_shadow then self.tex:toScreenFull(x+1, y+1, self.title_w, self.h, self.tex_w, self.tex_h, 0, 0, 0, self.text_shadow) end
 	self.tex:toScreenFull(x, y, self.title_w, self.h, self.tex_w, self.tex_h)
 	if self.focused then
 		self:drawFrame(self.frame_sel, x + self.title_w, y)
@@ -163,5 +164,6 @@ function _M:display(x, y, nb_keyframes)
 			if self.focus_decay <= 0 then self.focus_decay = nil end
 		end
 	end
+	if self.text_shadow then self.text_tex:toScreenFull(x+1 + self.text_x, y+1 + self.text_y, self.fw, self.fh, self.text_tex_w, self.text_tex_h, 0, 0, 0, self.text_shadow) end
 	self.text_tex:toScreenFull(x + self.text_x, y + self.text_y, self.fw, self.fh, self.text_tex_w, self.text_tex_h)
 end

@@ -98,7 +98,6 @@ function _M:display(x, y, nb_keyframes)
 	y = y + 4
 	if self.selected then
 		self:drawFrame(self.frame_sel, x, y)
-		self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 	elseif not self.focused then
 		self:drawFrame(self.frame, x, y, 1, 1, 1, 1)
 		if self.focus_decay then
@@ -106,9 +105,9 @@ function _M:display(x, y, nb_keyframes)
 			self.focus_decay = self.focus_decay - nb_keyframes
 			if self.focus_decay <= 0 then self.focus_decay = nil end
 		end
-		self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 	else
 		self:drawFrame(self.frame_sel, x, y, 1, 0.5, 0.5, 1)
-		self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 	end
+	if self.text_shadow then self.tex[1]:toScreenFull(x+1-frame_ox1, y+1-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3], 0, 0, 0, self.text_shadow) end
+	self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
 end

@@ -136,6 +136,7 @@ function _M:updateText()
 end
 
 function _M:display(x, y, nb_keyframes)
+	if self.text_shadow then self.tex:toScreenFull(x+1, y+1, self.title_w, self.h, self.tex_w, self.tex_h, 0, 0, 0, self.text_shadow) end
 	self.tex:toScreenFull(x, y, self.title_w, self.h, self.tex_w, self.tex_h)
 	if self.focused then
 		self:drawFrame(self.frame_sel, x + self.title_w, y)
@@ -148,5 +149,6 @@ function _M:display(x, y, nb_keyframes)
 			if self.focus_decay <= 0 then self.focus_decay = nil end
 		end
 	end
+	if self.text_shadow then self.text_tex:toScreenFull(x+1 + self.text_x, y+1 + self.text_y, self.fw, self.fh, self.text_tex_w, self.text_tex_h, 0, 0, 0, self.text_shadow) end
 	self.text_tex:toScreenFull(x + self.text_x, y + self.text_y, self.fw, self.fh, self.text_tex_w, self.text_tex_h)
 end

@@ -97,6 +97,7 @@ function _M:display(x, y)
 	for i = self.scroll, max do
 		local item = self.list[i]
 		if not item then break end
+		if self.text_shadow then item._tex:toScreenFull(x+1, y+1, self.fw, self.fh, item._tex_w, item._tex_h, 0, 0, 0, self.text_shadow) end
 		item._tex:toScreenFull(x, y, self.fw, self.fh, item._tex_w, item._tex_h)
 		y = y + self.fh
 	end

@@ -136,6 +136,7 @@ function _M:display(x, y)
 	for i = self.scroll, max do
 		local item = self.list[i]
 		if not item then break end
+		if self.text_shadow then item._tex:toScreenFull(x+1, y+1, self.fw, self.fh, item._tex_w, item._tex_h, 0, 0, 0, self.text_shadow) end
 		item._tex:toScreenFull(x, y, self.fw, self.fh, item._tex_w, item._tex_h)
 		y = y + self.fh
 	end

@@ -294,6 +294,7 @@ function _M:display(x, y, nb_keyframes)
 				s.t:toScreenFull(x, y + (self.fh - s.h) / 2, s.w, s.h, s.th, s.th)
 			end
 
+			if self.text_shadow then item.cols[j]._tex:toScreenFull(x+1, y+1, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h, 0, 0, 0, self.text_shadow) end
 			item.cols[j]._tex:toScreenFull(x, y, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h)
 			x = x + col.width
 		end

@@ -124,6 +124,7 @@ function _M:display(x, y, nb_keyframes)
 				if item.focus_decay <= 0 then item.focus_decay = nil end
 			end
 		end
+		if self.text_shadow then item._tex[1]:toScreenFull(x+1 + self.frame_sel.b4.w, y+1, self.fw, item.fh, item._tex[2], item._tex[3], 0, 0, 0, self.text_shadow) end
 		item._tex[1]:toScreenFull(x + self.frame_sel.b4.w, y, self.fw, item.fh, item._tex[2], item._tex[3])
 		y = y + item.fh
 	end

@@ -882,13 +882,6 @@ function _M:display(nb_keyframes)
 	else
 		self:targetDisplayTooltip(self.w, self.h)
 	end
-
-	if self.test then
-		for i = 1, #self.test do
-			local item = self.test[i]
-			item._tex:toScreenFull(300, 300 + item.h * i, item.w, item.h, item._tex_w, item._tex_h)
-		end
-	end
 end
 
 --- Called when a dialog is registered to appear on screen
@@ -944,8 +937,7 @@ function _M:setupCommands()
 --			self.state:debugRandomZone()
 --			local m = game.zone:makeEntity(game.level, "actor", {random_boss=true}, nil, true)
 --			if m then game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y + 1) end
-			local font = core.display.newFont("/data/font/Vera.ttf", 18)
-			self.test = font:draw("test #8810FF#plop #{italic}#zogzog#{normal}##LAST# tolopalak looooooooooooooooooooooooooonnnnng toto\nto\noooo", 200, 255, 255, 255)
+			self:registerDialog(require("mod.dialogs.Donation").new())
 		end end,
 	}
 

@@ -60,6 +60,7 @@ Map.faction_danger_check = function(self, e) return e.rank > 3 end
 
 -- Dialog UI
 UIBase.ui = config.settings.tome.ui_theme
+UIBase:setTextShadow(0.6)
 
 -- Dialogs fonts
 if config.settings.tome.fonts.type == "fantasy" then