diff --git a/changeNotes.html b/changeNotes.html index 8f57146..87dc468 100644 --- a/changeNotes.html +++ b/changeNotes.html @@ -1,3 +1,9 @@ +

v1.0.2


+
  • Add plugin icon.
  • +
  • Add settings reset function.
  • +
  • Fix one bug.
  • +
    +

    v1.0.1


  • Fixed a bug where the plugin was not available on version 2020.1.

  • diff --git a/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt b/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt index 8c6c751..c89d25a 100644 --- a/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt +++ b/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt @@ -254,7 +254,10 @@ class ColorSettingsPanelImpl : ColorSettingsPanel() { } } - override fun reset() {} + override fun reset() { + cbColorScheme.selectedItem = mSchemeName + } + override fun apply() { val isModified = isModified val persistentState = GlobalSettings.getPersistentState()