Skip to content

Commit ffebc05

Browse files
kdroidFilterkdroidFilter
committed
fix: resolve ktlint violations in shortcut and tray code
1 parent 154790a commit ffebc05

5 files changed

Lines changed: 103 additions & 23 deletions

File tree

‎src/jvmMain/kotlin/com/kdroid/composetray/lib/linux/LinuxTrayManager.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,13 @@ internal class LinuxTrayManager(
363363
item.shortcut?.let { shortcut ->
364364
runCatching {
365365
native.nativeItemSetShortcut(
366-
trayHandle, id,
366+
trayHandle,
367+
id,
367368
shortcut.toLinuxKey(),
368-
shortcut.ctrl, shortcut.shift, shortcut.alt, shortcut.meta,
369+
shortcut.ctrl,
370+
shortcut.shift,
371+
shortcut.alt,
372+
shortcut.meta,
369373
)
370374
}.onFailure { e -> warnln { "[LinuxTrayManager] Failed to set shortcut: ${e.message}" } }
371375
}

‎src/jvmMain/kotlin/com/kdroid/composetray/lib/mac/MacTrayManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.kdroid.composetray.lib.mac
22

33
import androidx.compose.runtime.mutableStateOf
4+
import com.kdroid.composetray.menu.api.KeyShortcut
45
import kotlinx.coroutines.CoroutineScope
56
import kotlinx.coroutines.Dispatchers
67
import kotlinx.coroutines.SupervisorJob
78
import kotlinx.coroutines.cancel
89
import kotlinx.coroutines.launch
9-
import com.kdroid.composetray.menu.api.KeyShortcut
1010
import java.util.concurrent.CountDownLatch
1111
import java.util.concurrent.atomic.AtomicBoolean
1212
import java.util.concurrent.locks.ReentrantLock

‎src/jvmMain/kotlin/com/kdroid/composetray/menu/api/KeyShortcut.kt‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ data class KeyShortcut(
2727
*/
2828
internal fun toMacModifierMask(): Long {
2929
var mask = 0L
30-
if (meta) mask = mask or (1L shl 20) // NSEventModifierFlagCommand
31-
if (shift) mask = mask or (1L shl 17) // NSEventModifierFlagShift
32-
if (alt) mask = mask or (1L shl 19) // NSEventModifierFlagOption
33-
if (ctrl) mask = mask or (1L shl 18) // NSEventModifierFlagControl
30+
if (meta) mask = mask or (1L shl 20) // NSEventModifierFlagCommand
31+
if (shift) mask = mask or (1L shl 17) // NSEventModifierFlagShift
32+
if (alt) mask = mask or (1L shl 19) // NSEventModifierFlagOption
33+
if (ctrl) mask = mask or (1L shl 18) // NSEventModifierFlagControl
3434
return mask
3535
}
3636

@@ -56,20 +56,57 @@ enum class Key(
5656
internal val macKeyEquivalent: String,
5757
internal val linuxKeyName: String,
5858
) {
59-
A("a", "a"), B("b", "b"), C("c", "c"), D("d", "d"), E("e", "e"),
60-
F("f", "f"), G("g", "g"), H("h", "h"), I("i", "i"), J("j", "j"),
61-
K("k", "k"), L("l", "l"), M("m", "m"), N("n", "n"), O("o", "o"),
62-
P("p", "p"), Q("q", "q"), R("r", "r"), S("s", "s"), T("t", "t"),
63-
U("u", "u"), V("v", "v"), W("w", "w"), X("x", "x"), Y("y", "y"),
59+
A("a", "a"),
60+
B("b", "b"),
61+
C("c", "c"),
62+
D("d", "d"),
63+
E("e", "e"),
64+
F("f", "f"),
65+
G("g", "g"),
66+
H("h", "h"),
67+
I("i", "i"),
68+
J("j", "j"),
69+
K("k", "k"),
70+
L("l", "l"),
71+
M("m", "m"),
72+
N("n", "n"),
73+
O("o", "o"),
74+
P("p", "p"),
75+
Q("q", "q"),
76+
R("r", "r"),
77+
S("s", "s"),
78+
T("t", "t"),
79+
U("u", "u"),
80+
V("v", "v"),
81+
W("w", "w"),
82+
X("x", "x"),
83+
Y("y", "y"),
6484
Z("z", "z"),
6585

66-
Num0("0", "0"), Num1("1", "1"), Num2("2", "2"), Num3("3", "3"), Num4("4", "4"),
67-
Num5("5", "5"), Num6("6", "6"), Num7("7", "7"), Num8("8", "8"), Num9("9", "9"),
86+
Num0("0", "0"),
87+
Num1("1", "1"),
88+
Num2("2", "2"),
89+
Num3("3", "3"),
90+
Num4("4", "4"),
91+
Num5("5", "5"),
92+
Num6("6", "6"),
93+
Num7("7", "7"),
94+
Num8("8", "8"),
95+
Num9("9", "9"),
6896

6997
// Function keys (AppKit private-use Unicode)
70-
F1("\uF704", "F1"), F2("\uF705", "F2"), F3("\uF706", "F3"), F4("\uF707", "F4"),
71-
F5("\uF708", "F5"), F6("\uF709", "F6"), F7("\uF70A", "F7"), F8("\uF70B", "F8"),
72-
F9("\uF70C", "F9"), F10("\uF70D", "F10"), F11("\uF70E", "F11"), F12("\uF70F", "F12"),
98+
F1("\uF704", "F1"),
99+
F2("\uF705", "F2"),
100+
F3("\uF706", "F3"),
101+
F4("\uF707", "F4"),
102+
F5("\uF708", "F5"),
103+
F6("\uF709", "F6"),
104+
F7("\uF70A", "F7"),
105+
F8("\uF70B", "F8"),
106+
F9("\uF70C", "F9"),
107+
F10("\uF70D", "F10"),
108+
F11("\uF70E", "F11"),
109+
F12("\uF70F", "F12"),
73110

74111
// Special keys
75112
Return("\r", "Return"),

‎src/jvmMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,15 @@ internal class NativeTray {
6666

6767
try {
6868
when (os) {
69-
LINUX -> LinuxTrayInitializer.update(instanceId, iconPath, tooltip, primaryAction, menuContent, onMenuOpened)
69+
LINUX ->
70+
LinuxTrayInitializer.update(
71+
instanceId,
72+
iconPath,
73+
tooltip,
74+
primaryAction,
75+
menuContent,
76+
onMenuOpened,
77+
)
7078
WINDOWS ->
7179
WindowsTrayInitializer.update(
7280
instanceId,
@@ -76,7 +84,15 @@ internal class NativeTray {
7684
menuContent,
7785
onMenuOpened,
7886
)
79-
MACOS -> MacTrayInitializer.update(instanceId, iconPath, tooltip, primaryAction, menuContent, onMenuOpened)
87+
MACOS ->
88+
MacTrayInitializer.update(
89+
instanceId,
90+
iconPath,
91+
tooltip,
92+
primaryAction,
93+
menuContent,
94+
onMenuOpened,
95+
)
8096
UNKNOWN -> {
8197
AwtTrayInitializer.update(iconPath, tooltip, primaryAction, menuContent)
8298
awtTrayUsed.set(true)
@@ -143,7 +159,15 @@ internal class NativeTray {
143159
menuContent,
144160
onMenuOpened,
145161
)
146-
MACOS -> MacTrayInitializer.update(instanceId, pngIconPath, tooltip, primaryAction, menuContent, onMenuOpened)
162+
MACOS ->
163+
MacTrayInitializer.update(
164+
instanceId,
165+
pngIconPath,
166+
tooltip,
167+
primaryAction,
168+
menuContent,
169+
onMenuOpened,
170+
)
147171
UNKNOWN -> {
148172
AwtTrayInitializer.update(pngIconPath, tooltip, primaryAction, menuContent)
149173
awtTrayUsed.set(true)
@@ -255,7 +279,14 @@ internal class NativeTray {
255279
when (os) {
256280
LINUX -> {
257281
debugln { "[NativeTray] Initializing Linux tray with icon path: $iconPath" }
258-
LinuxTrayInitializer.initialize(instanceId, iconPath, tooltip, primaryAction, menuContent, onMenuOpened)
282+
LinuxTrayInitializer.initialize(
283+
instanceId,
284+
iconPath,
285+
tooltip,
286+
primaryAction,
287+
menuContent,
288+
onMenuOpened,
289+
)
259290
trayInitialized = true
260291
}
261292
WINDOWS -> {
@@ -272,7 +303,14 @@ internal class NativeTray {
272303
}
273304
MACOS -> {
274305
debugln { "[NativeTray] Initializing macOS tray with icon path: $iconPath" }
275-
MacTrayInitializer.initialize(instanceId, iconPath, tooltip, primaryAction, menuContent, onMenuOpened)
306+
MacTrayInitializer.initialize(
307+
instanceId,
308+
iconPath,
309+
tooltip,
310+
primaryAction,
311+
menuContent,
312+
onMenuOpened,
313+
)
276314
trayInitialized = true
277315
}
278316
else -> {}

‎src/jvmMain/kotlin/com/kdroid/composetray/utils/MenuContentHash.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ object MenuContentHash {
126126
shortcut: KeyShortcut?,
127127
) {
128128
operations.add(
129-
"CheckableItemWithImageVectorIcon:$label:${iconTint != null}:$checked:$isEnabled:${icon.hashCode()}:$shortcut",
129+
"CheckableItemWithImageVectorIcon:$label:" +
130+
"${iconTint != null}:$checked:$isEnabled:${icon.hashCode()}:$shortcut",
130131
)
131132
}
132133

0 commit comments

Comments
 (0)