Skip to content

Commit 05f74aa

Browse files
committed
fix: 修复设置方向键样式无法自动选择当前样式
1 parent 0d074e4 commit 05f74aa

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

FCL/src/main/java/com/tungsten/fcl/control/DirectionStyleAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public DirectionStyleAdapter(Context context, ObservableList<ControlDirectionSty
4545
this.list = list;
4646
this.select = select;
4747

48-
if (DirectionStyles.getStyles().stream().anyMatch(it -> it == initStyle)) {
48+
if (initStyle != null && DirectionStyles.getStyles().stream().anyMatch(it -> it.getName().equals(initStyle.getName()))) {
4949
selectedStyle.set(initStyle);
50-
} else {
50+
} else {
5151
selectedStyle.set(list.get(0));
5252
}
5353
}

FCL/src/main/java/com/tungsten/fcl/control/EditViewDialog.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
import com.tungsten.fcl.control.data.ControlButtonData;
1919
import com.tungsten.fcl.control.data.ControlButtonStyle;
2020
import com.tungsten.fcl.control.data.ControlDirectionData;
21+
import com.tungsten.fcl.control.data.ControlDirectionStyle;
2122
import com.tungsten.fcl.control.data.ControlViewGroup;
2223
import com.tungsten.fcl.control.data.CustomControl;
2324
import com.tungsten.fcl.control.data.DirectionEventData;
25+
import com.tungsten.fcl.control.data.DirectionStyles;
2426
import com.tungsten.fcllibrary.component.dialog.EditDialog;
2527
import com.tungsten.fcl.util.AndroidUtils;
2628
import com.tungsten.fcl.util.FXUtils;
@@ -567,7 +569,8 @@ public EditDirectionDetails(Context context, GameMenu menu, ControlDirectionData
567569

568570
FCLButton style = findInfoView(R.id.style);
569571
style.setOnClickListener(v -> {
570-
DirectionStyleDialog dialog = new DirectionStyleDialog(context, true, data.getStyle(), data::setStyle);
572+
ControlDirectionStyle target = DirectionStyles.findStyleByName(data.getStyle().getName());
573+
DirectionStyleDialog dialog = new DirectionStyleDialog(context, true, target, data::setStyle);
571574
dialog.show();
572575
});
573576

0 commit comments

Comments
 (0)