AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'select a block' disappearing and grey-ish transparent quad behind block still showing when mouse is over an empty inventory slot in classic mode

Browse Source
This commit is contained in:
UnknownShadow200 2019-09-15 12:45:34 +10:00
parent efbcef5d59
commit fa1a00f472
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/Window.m
View File

@ -94,7 +94,7 @@ void Window_ProcessEvents(void) {
case NSKeyUp: case NSKeyUp:
key = Window_MapKey([ev keyCode]); key = Window_MapKey([ev keyCode]);
if (key) Input_SetPressed(key, true); if (key) Input_SetPressed(key, false);
break; break;
case NSScrollWheel: case NSScrollWheel:

5
src/Widgets.c
View File

@ -527,6 +527,7 @@ static void TableWidget_MakeBlockDesc(String* desc, BlockID block) {
String name; String name;
int block_ = block; int block_ = block;
if (Game_PureClassic) { String_AppendConst(desc, "Select block"); return; } if (Game_PureClassic) { String_AppendConst(desc, "Select block"); return; }
if (block == BLOCK_AIR) return;
name = Block_UNSAFE_GetName(block); name = Block_UNSAFE_GetName(block);
String_AppendString(desc, &name); String_AppendString(desc, &name);
@ -558,9 +559,9 @@ void TableWidget_MakeDescTex(struct TableWidget* w, BlockID block) {
struct DrawTextArgs args; struct DrawTextArgs args;
Gfx_DeleteTexture(&w->descTex.ID); Gfx_DeleteTexture(&w->descTex.ID);
if (block == BLOCK_AIR) return;
String_InitArray(desc, descBuffer); String_InitArray(desc, descBuffer);
TableWidget_MakeBlockDesc(&desc, block); TableWidget_MakeBlockDesc(&desc, block);
if (!desc.length) return;
DrawTextArgs_Make(&args, &desc, w->font, true); DrawTextArgs_Make(&args, &desc, w->font, true);
Drawer2D_MakeTextTexture(&w->descTex, &args); Drawer2D_MakeTextTexture(&w->descTex, &args);
@ -618,7 +619,7 @@ static void TableWidget_Render(void* widget, double delta) {
} }
cellSize = w->cellSize; cellSize = w->cellSize;
if (w->selectedIndex != -1 && Game_ClassicMode) { if (w->selectedIndex != -1 && Game_ClassicMode && w->blocks[w->selectedIndex] != BLOCK_AIR) {
TableWidget_GetCoords(w, w->selectedIndex, &x, &y); TableWidget_GetCoords(w, w->selectedIndex, &x, &y);
off = cellSize * 0.1f; off = cellSize * 0.1f;

2
src/Window.c
View File

@ -3785,7 +3785,7 @@ void Window_ProcessEvents(void) {
case 11: /* NSKeyUp */ case 11: /* NSKeyUp */
key = Window_MapKey((int)objc_msgSend(ev, sel_registerName("keyCode"))); key = Window_MapKey((int)objc_msgSend(ev, sel_registerName("keyCode")));
if (key) Input_SetPressed(key, true); if (key) Input_SetPressed(key, false);
break; break;
case 22: /* NSScrollWheel */ case 22: /* NSScrollWheel */