Skip to content
This repository was archived by the owner on Mar 26, 2024. It is now read-only.

Commit b98edad

Browse files
committed
Make argbIntToRgbaString more effective (kudos to #18)
1 parent 9fe1ab5 commit b98edad

File tree

2 files changed

+14
-14
lines changed
  • projector-client-common/src/commonMain/kotlin/org/jetbrains/projector/client/common/canvas
  • projector-client-web/src/main/kotlin/org/jetbrains/projector/client/web/state

2 files changed

+14
-14
lines changed

projector-client-common/src/commonMain/kotlin/org/jetbrains/projector/client/common/canvas/Extensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ object Extensions {
121121
fun Short.toFontFaceName(): String = "serverFont$this"
122122

123123
/* Creates an rgba(...) string (JS-like) by an ARGB number (Java-like). */
124-
fun Number.argbIntToRgbaString(): String {
125-
val colorValue = this.toLong()
124+
fun Int.argbIntToRgbaString(): String {
125+
val colorValue = this
126126

127127
val b = colorValue and 0xFF
128128
val g = (colorValue ushr 8) and 0xFF

projector-client-web/src/main/kotlin/org/jetbrains/projector/client/web/state/ProjectorUI.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ interface LafListener {
3232

3333
// Name of this class was chosen based on JBUI class.
3434
object ProjectorUI {
35-
var windowHeaderActiveBackgroundArgb = 0xFFE6E6E6
35+
var windowHeaderActiveBackgroundArgb = 0xFFE6E6E6.toInt()
3636
private set
3737

38-
var windowHeaderInactiveBackgroundArgb = 0xFFEDEDED
38+
var windowHeaderInactiveBackgroundArgb = 0xFFEDEDED.toInt()
3939
private set
4040

41-
var windowActiveBorderArgb = 0xFFD5D5D5
41+
var windowActiveBorderArgb = 0xFFD5D5D5.toInt()
4242
private set
4343

44-
var windowInactiveBorderArgb = 0xFFAAAAAA
44+
var windowInactiveBorderArgb = 0xFFAAAAAA.toInt()
4545
private set
4646

47-
var windowHeaderActiveTextArgb = 0xFF1A1A1A
47+
var windowHeaderActiveTextArgb = 0xFF1A1A1A.toInt()
4848
private set
4949

50-
var windowHeaderInactiveTextArgb = 0xFFDDDDDD
50+
var windowHeaderInactiveTextArgb = 0xFFDDDDDD.toInt()
5151
private set
5252

5353
var borderStyle = "1px solid ${windowActiveBorderArgb.argbIntToRgbaString()}"
@@ -59,12 +59,12 @@ object ProjectorUI {
5959
const val borderThickness = 8.0
6060

6161
fun setColors(colors: ServerWindowColorsEvent.ColorsStorage) {
62-
windowHeaderActiveBackgroundArgb = colors.windowHeaderActiveBackground.argb.toLong()
63-
windowHeaderInactiveBackgroundArgb = colors.windowHeaderInactiveBackground.argb.toLong()
64-
windowActiveBorderArgb = colors.windowActiveBorder.argb.toLong()
62+
windowHeaderActiveBackgroundArgb = colors.windowHeaderActiveBackground.argb
63+
windowHeaderInactiveBackgroundArgb = colors.windowHeaderInactiveBackground.argb
64+
windowActiveBorderArgb = colors.windowActiveBorder.argb
6565
borderStyle = "1px solid ${windowActiveBorderArgb.argbIntToRgbaString()}"
66-
windowInactiveBorderArgb = colors.windowInactiveBorder.argb.toLong()
67-
windowHeaderActiveTextArgb = colors.windowHeaderActiveText.argb.toLong()
68-
windowHeaderInactiveTextArgb = colors.windowHeaderInactiveText.argb.toLong()
66+
windowInactiveBorderArgb = colors.windowInactiveBorder.argb
67+
windowHeaderActiveTextArgb = colors.windowHeaderActiveText.argb
68+
windowHeaderInactiveTextArgb = colors.windowHeaderInactiveText.argb
6969
}
7070
}

0 commit comments

Comments
 (0)