From 93933a0d739eed979c2dc919e0d3f15a1fb73885 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 23 Oct 2019 10:12:12 +0200
Subject: [PATCH] Move crafting guide button to right side

---
 mods/crafting/api.lua                         |   5 ++--
 mods/default/formspec.lua                     |  22 ++++++++++++++----
 .../textures/ui_icon_craftingguide_active.png | Bin 0 -> 161 bytes
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 mods/default/textures/ui_icon_craftingguide_active.png

diff --git a/mods/crafting/api.lua b/mods/crafting/api.lua
index 65a71d8..56323e6 100644
--- a/mods/crafting/api.lua
+++ b/mods/crafting/api.lua
@@ -278,9 +278,8 @@ form = form .. "listring[current_player;craft_out]"
 form = form .. default.ui.get_itemslot_bg(0.25, 0.25, 1, 4)
 form = form .. default.ui.get_itemslot_bg(7.25, 3.25, 1, 1)
 
--- FIXME: This is placed below the item display, so it would collide with a potential 4th item in a craft recipe
--- As of 0.1.1, no craft used more than 3 item stacks so far.
-form = form .. default.ui.button(1.25, 3.25, 1.0, 1.0, "toggle_filter", "?", nil, S("Show all recipes/show only craftable recipes"))
+-- TODO: Use ui_icon_craftingguide_active.png when crafting guide is active
+form = form .. default.ui.tab(8.4, 0.5, "toggle_filter", "ui_icon_craftingguide.png", S("Show all recipes/show only craftable recipes"), "right")
 form = form .. default.ui.button(7.25, 1.25, 1, 1, "do_craft_1", "1")
 form = form .. default.ui.button(7.25, 2.25, 1, 1, "do_craft_10", "10")
 
diff --git a/mods/default/formspec.lua b/mods/default/formspec.lua
index 7097826..56beda1 100644
--- a/mods/default/formspec.lua
+++ b/mods/default/formspec.lua
@@ -135,15 +135,27 @@ end
 
 -- Tabs
 
-function default.ui.tab(x, y, name, icon, tooltip)
+function default.ui.tab(x, y, name, icon, tooltip, side)
    local tooltip = tooltip or ""
-   local shifted_icon = "[combine:16x16:0,0=ui_tab_active.png:0,1="..icon
+   local img_active
+   if side == "right" then
+      img_active = "[combine:16x16:0,0=(ui_tab_active.png^[transformFX):0,1="..icon
+   else
+      img_active = "[combine:16x16:0,0=ui_tab_active.png:0,1="..icon
+   end
 
    local form = ""
+   local img_inactive
+   if side == "right" then
+      img_inactive = "(ui_tab_inactive.png^[transformFX)^" .. icon
+   else
+      img_inactive = "ui_tab_inactive.png^" .. icon
+   end
 
-   form = form .. "image_button["..x..","..y..";1,1;ui_tab_inactive.png^"
-      ..icon..";"..name..";;true;false;"
-      ..minetest.formspec_escape(shifted_icon).."]"
+   form = form .. "image_button["..x..","..y..";1,1;"
+      ..minetest.formspec_escape(img_inactive)
+      ..";"..name..";;true;false;"
+      ..minetest.formspec_escape(img_active).."]"
 
    form = form .. "tooltip["..name..";"..minetest.formspec_escape(tooltip).."]"
 
diff --git a/mods/default/textures/ui_icon_craftingguide_active.png b/mods/default/textures/ui_icon_craftingguide_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da788b96d7b153da591c6d815f642baf3016308
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8J;eVAr*|t9;>5xj-{WQ!<Z;A
zTZQMc&o;)CESH2CX<3pDAI{aAG@M>4!NhTPMneN52hZh(x&Aj;6?(3k9;ssN^W<f&
zX`3j+y`s*&BRGeFH|Wvj<^B`@dQD^0*im;#ZIZzWkuDwvhEJ8Bn(SWpt^wM~;OXk;
Jvd$@?2>>#oHsb&Q

literal 0
HcmV?d00001