chylex/IntelliJ-AceJump
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-AceJump.git synced 2024-11-24 23:42:46 +01:00
Code

Compare commits

base: chylex:43dfec940e0658195c549130012b4413b6a6c465
Branches Tags
chylex:master
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental
..
compare: chylex:5979579042007e973f51f2093962068e100b9b61
Branches Tags
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:master
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental

No commits in common. "43dfec940e0658195c549130012b4413b6a6c465" and "5979579042007e973f51f2093962068e100b9b61" have entirely different histories.
43dfec940e ... 5979579042

3 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
} }
group = "org.acejump" group = "org.acejump"
version = "chylex-23" version = "chylex-22"
repositories { repositories {
mavenCentral() mavenCentral()

2
src/main/kotlin/org/acejump/config/AceSettingsPanel.kt
View File

@ -11,7 +11,6 @@ import com.intellij.ui.dsl.builder.columns
import com.intellij.ui.dsl.builder.panel import com.intellij.ui.dsl.builder.panel
import org.acejump.input.KeyLayout import org.acejump.input.KeyLayout
import java.awt.Color import java.awt.Color
import java.awt.Dimension
import java.awt.Font import java.awt.Font
import java.util.Hashtable import java.util.Hashtable
import javax.swing.JCheckBox import javax.swing.JCheckBox
@ -37,7 +36,6 @@ internal class AceSettingsPanel {
paintTicks = true paintTicks = true
minorTickSpacing = 1 minorTickSpacing = 1
majorTickSpacing = 1 majorTickSpacing = 1
minimumSize = Dimension(275, minimumSize.height)
} }
private val jumpModeColorWheel = ColorPanel() private val jumpModeColorWheel = ColorPanel()
private val tagForeground1ColorWheel = ColorPanel() private val tagForeground1ColorWheel = ColorPanel()

9
src/main/kotlin/org/acejump/search/Tagger.kt
View File

@ -133,11 +133,12 @@ class Tagger(private val editors: List<Editor>, results: Map<Editor, IntList>) {
return@Comparator if (aIsVisible) -1 else 1 return@Comparator if (aIsVisible) -1 else 1
} }
val firstEditor = editorPriority[0] val aPosition = aCaches.offsetToXY(aEditor, a.offset)
val caretPosition = caches.getValue(firstEditor).offsetToXY(firstEditor, firstEditor.caretModel.offset) val bPosition = bCaches.offsetToXY(bEditor, b.offset)
val aDistance = aCaches.offsetToXY(aEditor, a.offset).distanceSq(caretPosition) val caretPosition = editorPriority[0].offsetToXY(editorPriority[0].caretModel.offset)
val bDistance = bCaches.offsetToXY(bEditor, b.offset).distanceSq(caretPosition) val aDistance = aPosition.distanceSq(caretPosition)
val bDistance = bPosition.distanceSq(caretPosition)
return@Comparator aDistance.compareTo(bDistance) return@Comparator aDistance.compareTo(bDistance)
} }