dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed grid search box mode only changing after reopening gui

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-18 13:31:34 +02:00
parent 6e74d1d477
commit 3fa97ceaf8
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,5 +1,10 @@
# Refined Storage Changelog # Refined Storage Changelog
### 0.7.15
**Bugfixes**
- Fixed not being able to scroll with the scroll wheel using MouseTweaks
- Fixed grid search box mode only changing after reopening gui
### 0.7.14 ### 0.7.14
**Bugfixes** **Bugfixes**
- Updated Forge to build 1965 - Updated Forge to build 1965

4
src/main/java/refinedstorage/gui/GuiBase.java
View File

@@ -211,8 +211,6 @@ public abstract class GuiBase extends GuiContainer {
GlStateManager.translate(x, y, 1); GlStateManager.translate(x, y, 1);
GL11.glScalef(0.5f, 0.5f, 1); GL11.glScalef(0.5f, 0.5f, 1);
int stringWidth = fontRendererObj.getStringWidth(text);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.disableRescaleNormal(); GlStateManager.disableRescaleNormal();
GlStateManager.depthMask(false); GlStateManager.depthMask(false);
@@ -220,7 +218,7 @@ public abstract class GuiBase extends GuiContainer {
GlStateManager.blendFunc(770, 771); GlStateManager.blendFunc(770, 771);
GlStateManager.disableDepth(); GlStateManager.disableDepth();
fontRendererObj.drawStringWithShadow(text, 30 - stringWidth, 22, 16777215); fontRendererObj.drawStringWithShadow(text, 30 - fontRendererObj.getStringWidth(text), 22, 16777215);
GlStateManager.enableDepth(); GlStateManager.enableDepth();
GlStateManager.enableTexture2D(); GlStateManager.enableTexture2D();

7
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -102,10 +102,9 @@ public class GuiController extends GuiBase {
} }
if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
String message = t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()); drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage())
message += "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)); + "\n"
+ t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
drawTooltip(mouseX, mouseY, message);
} }
} }

13
src/main/java/refinedstorage/gui/GuiGrid.java
View File

@@ -97,8 +97,8 @@ public class GuiGrid extends GuiBase {
searchField.setEnableBackgroundDrawing(false); searchField.setEnableBackgroundDrawing(false);
searchField.setVisible(true); searchField.setVisible(true);
searchField.setTextColor(16777215); searchField.setTextColor(16777215);
searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode())); updateSearchBoxFocus(grid.getSearchBoxMode());
} else { } else {
searchField.xPosition = sx; searchField.xPosition = sx;
searchField.yPosition = sy; searchField.yPosition = sy;
@@ -106,7 +106,7 @@ public class GuiGrid extends GuiBase {
addSideButton(new SideButtonGridSortingDirection(grid)); addSideButton(new SideButtonGridSortingDirection(grid));
addSideButton(new SideButtonGridSortingType(grid)); addSideButton(new SideButtonGridSortingType(grid));
addSideButton(new SideButtonGridSearchBoxMode(grid)); addSideButton(new SideButtonGridSearchBoxMode(this));
} }
public IGrid getGrid() { public IGrid getGrid() {
@@ -247,7 +247,7 @@ public class GuiGrid extends GuiBase {
@Override @Override
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid")); drawString(7, 8, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
if (grid.getType() == EnumGridType.CRAFTING) { if (grid.getType() == EnumGridType.CRAFTING) {
drawString(7, 95, t("container.crafting")); drawString(7, 95, t("container.crafting"));
@@ -407,4 +407,9 @@ public class GuiGrid extends GuiBase {
RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
} }
} }
public void updateSearchBoxFocus(int mode) {
searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(mode));
searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(mode));
}
} }

16
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -3,19 +3,19 @@ package refinedstorage.gui.sidebutton;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.gui.GuiBase; import refinedstorage.gui.GuiBase;
import refinedstorage.tile.grid.IGrid; import refinedstorage.gui.GuiGrid;
import refinedstorage.tile.grid.TileGrid; import refinedstorage.tile.grid.TileGrid;
public class SideButtonGridSearchBoxMode extends SideButton { public class SideButtonGridSearchBoxMode extends SideButton {
private IGrid grid; private GuiGrid gui;
public SideButtonGridSearchBoxMode(IGrid grid) { public SideButtonGridSearchBoxMode(GuiGrid gui) {
this.grid = grid; this.gui = gui;
} }
@Override @Override
public String getTooltip(GuiBase gui) { public String getTooltip(GuiBase gui) {
return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.search_box_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.search_box_mode." + grid.getSearchBoxMode()); return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.search_box_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.search_box_mode." + this.gui.getGrid().getSearchBoxMode());
} }
@Override @Override
@@ -26,7 +26,7 @@ public class SideButtonGridSearchBoxMode extends SideButton {
@Override @Override
public void actionPerformed() { public void actionPerformed() {
int mode = grid.getSearchBoxMode(); int mode = gui.getGrid().getSearchBoxMode();
if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL) { if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL) {
mode = TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED; mode = TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED;
@@ -42,6 +42,8 @@ public class SideButtonGridSearchBoxMode extends SideButton {
mode = TileGrid.SEARCH_BOX_MODE_NORMAL; mode = TileGrid.SEARCH_BOX_MODE_NORMAL;
} }
grid.onSearchBoxModeChanged(mode); gui.getGrid().onSearchBoxModeChanged(mode);
gui.updateSearchBoxFocus(mode);
} }
} }