much update, such code

@@ -24,8 +24,10 @@ local Entity = require "engine.Entity"
 local Dialog = require "engine.ui.Dialog"
 local Image = require "engine.ui.Image"
 local Textzone = require "engine.ui.Textzone"
+local Separator = require "engine.ui.Separator"
 local TextzoneList = require "engine.ui.TextzoneList"
 local ListColumns = require "engine.ui.ListColumns"
+local VariableList = require "engine.ui.VariableList"
 local Button = require "engine.ui.Button"
 local WebView = require "engine.ui.WebView"
 
@@ -37,38 +39,52 @@ local bonus_vault_slots_tooltip = "For every purchase of #{italic}##GREY#%s#LAST
 local coins_balance_text = "#{italic}##UMBER#Voratun Coins available from your donations: #ROYAL_BLUE#%d#{normal}#"
 local coins_balance_tooltip = "For every donations you've ever made you have earned voratun coins. These can be spent purchasing expansions or options on the online store. This is the amount you have left, if your purchase total is below this number you'll instantly get your purchase validated, if not you'll need to donate some more first.\n#GOLD##{italic}#Thanks for your support, every little bit helps the game survive for years on!#{normal}#"
 
+_M.force_ui_inside = "microtxn"
+
 function _M:init(mode)
 	if not mode then mode = core.steam and "steam" or "te4" end
 	self.mode = mode
 
-	self.ui = "microtxn"
-
 	self.cart = {}
 
+
 	self.base_title_text = game.__mod_info.long_name.." #GOLD#Online Store#LAST#"
 	Dialog.init(self, self.base_title_text, game.w * 0.8, game.h * 0.8)
 
+	game.tooltip:generate()
+
 	self.categories_icons = {
-		pay2die = Entity.new{image="/data/gfx/mtx/ui/category_pay2die.png"},
-		community = Entity.new{image="/data/gfx/mtx/ui/category_community.png"},
-		cosmetic = Entity.new{image="/data/gfx/mtx/ui/category_cosmetic.png"},
-		misc = Entity.new{image="/data/gfx/mtx/ui/category_misc.png"},
+		pay2die = "/data/gfx/microtxn-ui/category_pay2die.png",
+		community = "/data/gfx/microtxn-ui/category_community.png",
+		cosmetic = "/data/gfx/microtxn-ui/category_cosmetic.png",
+		misc = "/data/gfx/microtxn-ui/category_misc.png",
 	}
-	local in_cart_icon = Entity.new{image="/data/gfx/mtx/ui/in_cart.png"}
+	local in_cart_icon = Entity.new{image="/data/gfx/microtxn-ui/in_cart.png"}
+	-- local icon_frame = Entity.new{image="/data/gfx/microtxn-ui/icon_frame.png"}
 
 	self.list = {}
 	self.purchasables = {}
 	self.recap = {}
 
+	local vsep = Separator.new{dir="horizontal", size=self.ih - 10}
+
 	self.c_waiter = Textzone.new{auto_width=1, auto_height=1, text="#YELLOW#-- connecting to server... --"}
-	self.c_list = ListColumns.new{width=self.iw - 350, height=self.ih, item_height=132, hide_columns=true, scrollbar=true, sortable=true, columns={
-		{name="", width=100, display_prop="", direct_draw=function(item, x, y)
+
+	self.c_list = VariableList.new{width=self.iw - 350 - vsep.w, max_height=self.ih, scrollbar=true, sortable=true,
+		direct_draw=function(item, x, y, get_size)
+			if get_size then return 132 end
 			item.img:toScreen(nil, x+2, y+2, 128, 128)
-			item.category_img:toScreen(nil, x+2+64+32, y+2+64+32, 32, 32)
 			if self.cart[item.id_purchasable] and item.nb_purchase > 0 then in_cart_icon:toScreen(nil, x+2, y+2, 128, 128) end
 			item.txt:display(x+10+130, y+2 + (128 - item.txt.h) / 2, 0)
-		end},
-	}, list=self.list, all_clicks=true, fct=function(item, _, button) self:use(item, button) end, select=function(item, sel) self:onSelectItem(item) end}
+		end,
+	list=self.list, all_clicks=true, fct=function(item, _, button) self:use(item, button) end, select=function(item, sel) self:onSelectItem(item) end}
+	-- self.c_list = ListColumns.new{width=self.iw - 350 - vsep.w, height=self.ih, item_height=132, hide_columns=true, scrollbar=true, sortable=true, columns={
+	-- 	{name="", width=100, display_prop="", direct_draw=function(item, x, y)
+	-- 		item.img:toScreen(nil, x+2, y+2, 128, 128)
+	-- 		if self.cart[item.id_purchasable] and item.nb_purchase > 0 then in_cart_icon:toScreen(nil, x+2, y+2, 128, 128) end
+	-- 		item.txt:display(x+10+130, y+2 + (128 - item.txt.h) / 2, 0)
+	-- 	end},
+	-- }, list=self.list, all_clicks=true, fct=function(item, _, button) self:use(item, button) end, select=function(item, sel) self:onSelectItem(item) end}
 	self.c_list.on_focus_change = function(_, v) if not v then game:tooltipHide() end end
 
 	self.c_bonus_vault_slots = Textzone.new{has_box=true, width=340, auto_height=1, text=bonus_vault_slots_text:format(0), can_focus=true}
@@ -93,7 +109,7 @@ function _M:init(mode)
 
 	self.c_do_purchase = Button.new{text="Purchase", fct=function() self:doPurchase() end}
 
-	self.c_recap = ListColumns.new{width=350, height=self.ih - self.c_do_purchase.h - math.max(self.c_bonus_vault_slots.h, self.c_coins_available.h), scrollbar=true, columns={
+	self.c_recap = ListColumns.new{width=350, height=self.ih - self.c_do_purchase.h - 15 - math.max(self.c_bonus_vault_slots.h, self.c_coins_available.h), scrollbar=true, columns={
 		{name="Name", width=50, display_prop="recap_name"},
 		{name="Price", width=35, display_prop="recap_price"},
 		{name="Qty", width=15, display_prop="recap_qty"},
@@ -109,15 +125,16 @@ function _M:init(mode)
 	local uis = {
 		{vcenter=0, hcenter=0, ui=self.c_waiter},
 		{left=0, top=0, ui=self.c_list},
+		{left=self.c_list, top=0, ui=vsep},
 		{right=0, top=0, ui=self.c_recap},
 		{right=0, bottom=0, ui=self.c_do_purchase},
 --		{left=0, top=0, ui=wv},
 	}
 	-- Only show those for steam as te4.org purchases require already having a donation up
 	if mode == "steam" then
-		uis[#uis+1] = {right=0, bottom=self.c_do_purchase, ui=self.c_bonus_vault_slots}
+		uis[#uis+1] = {right=0, bottom=self.c_do_purchase.h+15, ui=self.c_bonus_vault_slots}
 	elseif mode == "te4" then
-		uis[#uis+1] = {right=0, bottom=self.c_do_purchase, ui=self.c_coins_available}
+		uis[#uis+1] = {right=0, bottom=self.c_do_purchase.h+15, ui=self.c_coins_available}
 	end
 
 	self:loadUI(uis)
@@ -138,6 +155,13 @@ function _M:init(mode)
 	self:generateList()
 end
 
+function _M:unload()
+	game.tooltip:generate()
+end
+
+-- function _M:innerDisplay(x, y, nb_keyframes)
+-- end
+
 function _M:checks() game:onTickEnd(function()
 	if not profile.auth then
 		game:unregisterDialog(self)
@@ -240,6 +264,8 @@ function _M:updateCart()
 end
 
 function _M:doPurchase()
+	if table.count(self.cart) == 0 then self:simplePopup("Cart", "Cart is empty!") return end
+
 	self.in_paying_ui = true
 	if core.steam then self:doPurchaseSteam()
 	else self:doPurchaseTE4()
@@ -459,8 +485,13 @@ function _M:generateList()
 		for _, res in ipairs(e.data.list) do
 			res.id_purchasable = res.id
 			res.nb_purchase = 0
-			res.img = Entity.new{image=res.image}
-			res.category_img = self.categories_icons[res.category or "misc"] or self.categories_icons.misc
+			res.img = Entity.new{
+				image=res.image,
+				add_mos={
+					{image="/data/gfx/microtxn-ui/icon_frame.png"},
+					{image=self.categories_icons[res.category or "misc"] or self.categories_icons.misc},
+				},
+			}
 			res.txt = TextzoneList.new{width=self.iw - 10 - 132 - 350, height=128, pingpong=20, scrollbar=true}
 			res.txt:switchItem(true, ("%s (%s)\n#SLATE##{italic}#%s#{normal}#"):format(res.name, self:currencyDisplay(res.price), res.desc))
 			res.txt.pingpong = nil

@@ -27,6 +27,8 @@ local Button = require "engine.ui.Button"
 
 module(..., package.seeall, class.inherit(Dialog))
 
+_M.force_ui_inside = "microtxn"
+
 function _M:init(mode)
 	if not mode then mode = core.steam and "steam" or "te4" end
 	self.mode = mode

@@ -353,6 +353,11 @@ end
 title_shadow = true
 
 function _M:init(title, w, h, x, y, alpha, font, showup, skin)
+	if self.force_ui_inside then
+		self._lastui = self.ui
+		Base:changeDefault(self.force_ui_inside)
+	end
+
 	self.title = title
 	self.alpha = self.alpha or 255
 	if showup ~= nil then
@@ -407,9 +412,11 @@ function _M:init(title, w, h, x, y, alpha, font, showup, skin)
 		self.frame.title_y = conf.title_bar.y
 		self.frame.title_w = conf.title_bar.w
 		self.frame.title_h = conf.title_bar.h
-		self.frame.b7 = self.frame.b7:gsub("dialogframe", "title_dialogframe")
-		self.frame.b8 = self.frame.b8:gsub("dialogframe", "title_dialogframe")
-		self.frame.b9 = self.frame.b9:gsub("dialogframe", "title_dialogframe")
+		if not conf.title_bar.no_gfx then
+			self.frame.b7 = self.frame.b7:gsub("dialogframe", "title_dialogframe")
+			self.frame.b8 = self.frame.b8:gsub("dialogframe", "title_dialogframe")
+			self.frame.b9 = self.frame.b9:gsub("dialogframe", "title_dialogframe")
+		end
 	end
 
 	self.uis = {}
@@ -501,6 +508,11 @@ function _M:generate()
 		_RIGHT = function() self:moveFocus(1) end,
 	}
 	self.key:addBind("SCREENSHOT", function() if type(game) == "table" and game.key then game.key:triggerVirtual("SCREENSHOT") end end)
+
+	if self._lastui then
+		Base:changeDefault(self._lastui)
+		self._lastui = nil
+	end
 end
 
 function _M:updateTitle(title)

@@ -32,7 +32,9 @@ function _M:init(t)
 	self.max_h = t.max_height
 	self.fct = t.fct
 	self.select = t.select
+	self.direct_draw = t.direct_draw
 	self.scrollbar = t.scrollbar
+	self.all_clicks = t.all_clicks
 	self.min_items_shown = t.min_items_shown or 3
 	self.display_prop = t.display_prop or "name"
 
@@ -58,22 +60,28 @@ function _M:generate()
 	local sh = 0
 	local minh = 0
 	for i, item in ipairs(self.list) do
-		local color = item.color or {255,255,255}
-		local width = fw - self.frame_sel.b4.w - self.frame_sel.b6.w
+		local ifh = 0
+		if not self.direct_draw then
+			local color = item.color or {255,255,255}
+			local width = fw - self.frame_sel.b4.w - self.frame_sel.b6.w
 
-		local text = self.font:draw(item[self.display_prop], width, color[1], color[2], color[3])
-		local fh = fh * #text + self.frame_sel.b8.w / 3 * 2
+			local text = self.font:draw(item[self.display_prop], width, color[1], color[2], color[3])
+			ifh = fh * #text + self.frame_sel.b8.w / 3 * 2
 
-		local texs = {}
-		for z, tex in ipairs(text) do
-			texs[z] = {t=tex._tex, tw=tex._tex_w, th = tex._tex_h, w=tex.w, h=tex.h, y = (z - 1) * self.font_h + self.frame_sel.b8.w / 3}
+			local texs = {}
+			for z, tex in ipairs(text) do
+				texs[z] = {t=tex._tex, tw=tex._tex_w, th = tex._tex_h, w=tex.w, h=tex.h, y = (z - 1) * self.font_h + self.frame_sel.b8.w / 3}
+			end
+			item.start_h = sh
+			item.fh = ifh
+			item._texs = texs
+		else
+			ifh = self.direct_draw(item, 0, sh, true)
+			item.start_h = sh
+			item.fh = ifh
 		end
 
-		item.start_h = sh
-		item.fh = fh
-		item._texs = texs
-
-		sh = sh + fh
+		sh = sh + ifh
 		if i <= self.min_items_shown then minh = sh end
 	end
 	self.h = math.max(minh, math.min(self.max_h or 1000000, sh))
@@ -81,7 +89,7 @@ function _M:generate()
 
 	self.scroll_inertia = 0
 	self.scroll = 0
-	if self.scrollbar then self.scrollbar = Slider.new{size=self.h, max=sh} end
+	if self.scrollbar then self.scrollbar = Slider.new{size=self.h, max=sh, ui=self.ui} end
 
 	self.mouse:registerZone(0, 0, self.w, self.h, function(button, x, y, xrel, yrel, bx, by, event)
 		self.last_input_was_keyboard = false
@@ -96,7 +104,7 @@ function _M:generate()
 				if self.sel and self.list[self.sel] then self.list[self.sel].focus_decay = self.focus_decay_max end
 				self.sel = i
 				self:onSelect()
-				if button == "left" and event == "button" then self:onUse() end
+				if (self.all_clicks or button == "left") and event == "button" then self:onUse(button, event) end
 				break
 			end
 		end
@@ -104,7 +112,7 @@ function _M:generate()
 
 	-- Add UI controls
 	self.key:addBinds{
-		ACCEPT = function() self:onUse() end,
+		ACCEPT = function() self:onUse("left", "key") end,
 		MOVE_UP = function()
 			if self.sel and self.list[self.sel] then self.list[self.sel].focus_decay = self.focus_decay_max end
 			self.sel = util.boundWrap(self.sel - 1, 1, self.max) self:onSelect()
@@ -116,12 +124,17 @@ function _M:generate()
 	}
 end
 
-function _M:onUse()
+function _M:setList(list)
+	self.list = list
+	self:generate()
+end
+
+function _M:onUse(button, event)
 	local item = self.list[self.sel]
 	if not item then return end
 	self:sound("button")
-	if item.fct then item:fct()
-	else self.fct(item, self.sel) end
+	if item.fct then item:fct(button, event)
+	else self.fct(item, self.sel, button, event) end
 end
 
 function _M:onSelect()
@@ -149,6 +162,7 @@ end
 
 function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 	local by = y
+	local display_y = 0
 	core.display.glScissor(true, screen_x, screen_y, self.w, self.h)
 
 	if self.scrollbar then
@@ -183,11 +197,18 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 				if item.focus_decay <= 0 then item.focus_decay = nil end
 			end
 		end
-		for z, tex in pairs(item._texs) do
-			if self.text_shadow then self:textureToScreen(tex, x+1 + self.frame_sel.b4.w, y+1 + tex.y, 0, 0, 0, self.text_shadow) end
-			self:textureToScreen(tex, x + self.frame_sel.b4.w, y + tex.y)
+		if not self.direct_draw then
+			for z, tex in pairs(item._texs) do
+				if self.text_shadow then self:textureToScreen(tex, x+1 + self.frame_sel.b4.w, y+1 + tex.y, 0, 0, 0, self.text_shadow) end
+				self:textureToScreen(tex, x + self.frame_sel.b4.w, y + tex.y)
+			end
+		else
+			self.direct_draw(item, x + self.frame_sel.b4.w, y)
 		end
+		item.last_display_x = screen_x
+		item.last_display_y = screen_y + display_y
 		y = y + item.fh
+		display_y = display_y + item.fh
 	end
 
 	core.display.glScissor(false)

@@ -21,9 +21,9 @@ microtxn = {
 	frame_shadow = {x=15, y=15, a=0.5},
 	frame_alpha = 1,
 	frame_darkness = 0.6,
-	frame_ox1 = -60,
-	frame_ox2 =  60,
-	frame_oy1 = -60,
-	frame_oy2 =  60,
---	title_bar = {x=0, y=-17, w=4, h=25},
+	frame_ox1 = -128,
+	frame_ox2 =  128,
+	frame_oy1 = -155,
+	frame_oy2 =  165,
+	title_bar = {x=0, y=-65, w=4, h=25, no_gfx=true},
 }
\ No newline at end of file

@@ -31,6 +31,8 @@ local Map = require "engine.Map"
 
 module(..., package.seeall, class.inherit(Dialog))
 
+_M.force_ui_inside = "microtxn"
+
 function _M:init(source)
 	self.donation_source = source or "ingame"
 	Dialog.init(self, "Donations", 600, 300)

+export LD_PRELOAD=~/.local/share/Steam/ubuntu12_64/gameoverlayrenderer.so
+