BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/compare

Browse Source
This commit is contained in:
Bane Stojkovic
2025-05-21 22:37:19 +02:00
parent f88f867bf4 05c22078bc
commit 0c3f1d7091
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/main/resources/update.xml
+4
View File
@@ -309,6 +309,10 @@
<changeType>IMPROVEMENT</changeType>
<description>Improved the styling of circuit analysis reports</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>X or Q keys sometimes do not register in secondary dialogs</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>If the internet connection is present, but unstable, the application starts but nothing can be clicked until the connection restores</description>
diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/explorer/ExplorerPlugin.java
+3 -1
View File
@@ -90,7 +90,9 @@ public class ExplorerPlugin implements IPlugIn {
@Override
public boolean dispatchKeyEvent(KeyEvent e) {
if (e.getKeyChar() == 'x' && e.getModifiersEx() == 0
if (explorerPane != null
&& (canvasPanel.hasFocus() || explorerPane.hasFocus())
&& e.getKeyChar() == 'x' && e.getModifiersEx() == 0
&& ConfigurationManager.getInstance()
.readBoolean(ConfigPlugin.PROJECT_EXPLORER, true)) {
explorerPane.getSearchField().requestFocusInWindow();
diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/ComponentTree.java
+4 -3
View File
@@ -80,12 +80,13 @@ public class ComponentTree implements IPlugIn {
@Override
public boolean dispatchKeyEvent(KeyEvent e) {
if ((canvasPanel.hasFocus() || treePanel.hasFocus())
&& e.getKeyChar() == 'q'
if (treePanel != null
&& (canvasPanel.hasFocus() || treePanel.hasFocus())
&& e.getKeyChar() == 'q' && e.getModifiersEx() == 0
&& ConfigurationManager.getInstance()
.readString(ConfigPlugin.COMPONENT_BROWSER, ConfigPlugin.SEARCHABLE_TREE)
.equals(ConfigPlugin.SEARCHABLE_TREE)) {
getTreePanel().getSearchField().requestFocusInWindow();
treePanel.getSearchField().requestFocusInWindow();
return true;
}
return false;