Skip to content

Commit d9027c1

Browse files
committed
Post-merge-1.11.0-alpha04 code review fixes
1 parent 25560e2 commit d9027c1

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/ContextMenu.desktop.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private fun TextFieldSelectionState.textManager(coroutineScope: CoroutineScope):
233233
endOffset = index,
234234
isStartHandle = false,
235235
adjustment = SelectionAdjustment.Word,
236-
hapticFeedbackType = null
236+
hapticFeedbackType = null,
237237
)
238238
textFieldState.selectCharsIn(selection)
239239
}

compose/ui/ui-graphics/src/skikoMain/kotlin/androidx/compose/ui/graphics/SkiaBackedCanvas.skiko.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ import org.jetbrains.skia.MipmapMode
3535
import org.jetbrains.skia.SamplingMode
3636
import org.jetbrains.skia.impl.use
3737

38-
@Deprecated("Use direct reference to platform type instead of typealias")
38+
@Deprecated(
39+
message = "Use direct reference to org.jetbrains.skia.Canvas instead of typealias",
40+
replaceWith = ReplaceWith("Canvas", "org.jetbrains.skia.Canvas")
41+
)
3942
actual typealias NativeCanvas = org.jetbrains.skia.Canvas
4043

4144
internal actual fun ActualCanvas(image: ImageBitmap): Canvas {

compose/ui/ui-text/src/darwinMain/kotlin/androidx/compose/ui/text/intl/NativePlatformLocale.darwin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ internal fun NSLocale.isRtl(): Boolean =
3535
NSLocale.characterDirectionForLanguage(languageCode) == NSLocaleLanguageDirectionRightToLeft
3636

3737

38+
// TODO: https://youtrack.jetbrains.com/issue/CMP-9697/Add-public-API-to-create-a-Compose-Locale-instance-via-NSLocale
3839
@Immutable
3940
actual class Locale internal constructor(internal val platformLocale: NSLocale) {
4041
actual val language: String

0 commit comments

Comments
 (0)