Skip to content

Commit

Permalink
GP-4779 fixed issue in add references dialog where moving mouse would
Browse files Browse the repository at this point in the history
sometimes reset address space choice in comboBox.
  • Loading branch information
ghidragon committed Jul 18, 2024
1 parent aced7d3 commit 8225c10
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -235,7 +235,7 @@ private void installCallingConventionWidget(JPanel parentPanel) {

private void installInlineWidget(JPanel parentPanel) {
inlineCheckBox = new GCheckBox("Inline");
inlineCheckBox.addChangeListener(e -> {
inlineCheckBox.addItemListener(e -> {
if (inlineCheckBox.isSelected() && callFixupComboBox != null) {
callFixupComboBox.setSelectedItem(NONE_CHOICE);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -103,7 +103,7 @@ private void buildPanel() {
.setAccessibleDescription(
"Selecting this checkbox allows entering a refernce offset");
offsetCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);
offsetCheckbox.addChangeListener(e -> enableOffsetField(offsetCheckbox.isSelected()));
offsetCheckbox.addItemListener(e -> enableOffsetField(offsetCheckbox.isSelected()));
offsetField = new JTextField();
offsetField.getAccessibleContext().setAccessibleName("Enter Offset");

Expand All @@ -123,7 +123,7 @@ private void buildPanel() {

includeOtherOverlaysCheckbox = new JCheckBox("Include OTHER overlay spaces",
Boolean.getBoolean(Preferences.getProperty(INCLUDE_OTHER_OVERLAY_PREFERENCE, "false")));
includeOtherOverlaysCheckbox.addChangeListener(e -> refreshToAddressField());
includeOtherOverlaysCheckbox.addItemListener(e -> refreshToAddressField());

refTypes = new GhidraComboBox<>(MEM_REF_TYPES);
refTypes.getAccessibleContext().setAccessibleName("Memory Ref Types");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -416,7 +416,7 @@ else if (comboAdded) {
remove(combo);
comboAdded = false;
}
invalidate();
revalidate();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -838,7 +838,7 @@ private JComboBox<Enum<?>> createComboBox(final String optionName, final Enum<?>

private JCheckBox createCheckBox(String optionName) {
JCheckBox applyCheckBox = new GCheckBox(optionName);
applyCheckBox.addChangeListener(e -> changesMade(true));
applyCheckBox.addItemListener(e -> changesMade(true));

return applyCheckBox;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -376,7 +376,7 @@ public TestPanel(ConditionTester conditionTest) {
label = new GDLabel(test.getName());
add(label);
label.setToolTipText(test.getDescription());
checkbox.addChangeListener(e -> {
checkbox.addItemListener(e -> {
conditionTestModel.setEnabled(test, checkbox.isSelected());
label.setEnabled(checkbox.isSelected());
});
Expand Down

0 comments on commit 8225c10

Please sign in to comment.