diff --git a/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java b/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java index bf0d257e79..a2b2897f55 100644 --- a/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java +++ b/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java @@ -76,6 +76,14 @@ public class AutoupdateUtil { ); } + public static void trueLayout(Component component) { + if (component == null) + return; + component.invalidate(); + component.validate(); + component.repaint(); + } + public static class ConnectionAndMeta { private String zipFileName; private HttpURLConnection httpConnection; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java index 42abd8eeee..a039407eb7 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java @@ -188,7 +188,6 @@ public class RecentCommands { content.add(createButton(reentrant, entry.command)); } } - UiUtils.trueRepaint(content.getParent()); UiUtils.trueLayout(content.getParent()); } }); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java index f99d6fc130..9afb718c52 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -234,7 +234,7 @@ public class EngineSnifferPanel { * this is to fix the UI glitch when images tab shows a tiny square */ System.out.println("displayChart"); - UiUtils.trueRepaint(chartPanel.getParent()); + UiUtils.trueLayout(chartPanel.getParent()); } public JPanel getPanel() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java index 3d1d4a1005..0b7d58852f 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java @@ -1,6 +1,7 @@ package com.rusefi.ui.util; import com.rusefi.StartupFrame; +import com.rusefi.autoupdate.AutoupdateUtil; import org.jetbrains.annotations.NotNull; import javax.imageio.ImageIO; @@ -77,27 +78,14 @@ public class UiUtils { * to hack http://rusefi.com/forum/viewtopic.php?f=2&t=631&p=10083#p10081 */ public static void trueRepaint(JComponent control) { - control.invalidate(); - control.repaint(); - } - - public static void trueRepaint(Container control) { trueLayout(control); -// if (control == null) -// return; -// control.invalidate(); -// control.repaint(); } /** * todo: one 'trueXXX' method should be enough, which one? */ public static void trueLayout(Component component) { - if (component == null) - return; - component.invalidate(); - component.validate(); - component.repaint(); + AutoupdateUtil.trueLayout(component); } public static java.util.List getAllComponents(final Container c) { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java index 874b8fe600..f5b45b71b4 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java @@ -78,7 +78,6 @@ public class SensorGauge { wrapper.removeAllChildrenAndListeners(); wrapper.addMouseListener(mouseListener); wrapper.add(gauge, BorderLayout.CENTER); - UiUtils.trueRepaint(wrapper.getParent()); UiUtils.trueLayout(wrapper.getParent()); }