mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Do not create Code Style settings "Copy From" popup menu until it is requested to be shown.
This commit is contained in:
@@ -620,5 +620,9 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
|
||||
copyMenu.removeAll();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isCopyFromMenuAvailable() {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+6
-1
@@ -476,7 +476,12 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane
|
||||
myConfigurable.reset();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isCopyFromMenuAvailable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
//========================================================================================================================================
|
||||
|
||||
private class MyIndentOptionsWrapper extends CodeStyleAbstractPanel {
|
||||
|
||||
+9
-5
@@ -317,11 +317,7 @@ public class CodeStyleSchemesPanel{
|
||||
public void setCodeStyleSettingsPanel(NewCodeStyleSettingsPanel settingsPanel) {
|
||||
mySettingsPanel = settingsPanel;
|
||||
CodeStyleAbstractPanel selectedPanel = mySettingsPanel.getSelectedPanel();
|
||||
if (selectedPanel != null) {
|
||||
initCopyFromMenu();
|
||||
selectedPanel.setupCopyFromMenu(myCopyFromMenu);
|
||||
}
|
||||
myCopyFromButton.setEnabled(myCopyFromMenu.getItemCount() > 0);
|
||||
myCopyFromButton.setEnabled(selectedPanel != null && selectedPanel.isCopyFromMenuAvailable());
|
||||
}
|
||||
|
||||
private void onSettingsTypeChange() {
|
||||
@@ -344,6 +340,14 @@ public class CodeStyleSchemesPanel{
|
||||
myCopyFromMenu = new PopupMenu();
|
||||
myCopyFromButton.add(myCopyFromMenu);
|
||||
}
|
||||
CodeStyleAbstractPanel selectedPanel = mySettingsPanel.getSelectedPanel();
|
||||
if (selectedPanel != null) {
|
||||
selectedPanel.setupCopyFromMenu(myCopyFromMenu);
|
||||
myCopyFromButton.setEnabled(myCopyFromMenu.getItemCount() > 0);
|
||||
}
|
||||
else {
|
||||
myCopyFromButton.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user