Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
27a93c41
Unverified
Commit
27a93c41
authored
Oct 11, 2021
by
Nikolay Igotti
Committed by
GitHub
Oct 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to Skia m96-fd5bb8d130 and Ubuntu 18 build (#249)
parent
534d24a8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
12 deletions
+18
-12
properties.kt
skiko/buildSrc/src/main/kotlin/properties.kt
+1
-1
gradle.properties
skiko/gradle.properties
+8
-8
SkiaLayer.macos.kt
...c/macosMain/kotlin/org/jetbrains/skiko/SkiaLayer.macos.kt
+9
-3
No files found.
skiko/buildSrc/src/main/kotlin/properties.kt
View file @
27a93c41
...
@@ -127,7 +127,7 @@ class SkikoProperties(private val myProject: Project) {
...
@@ -127,7 +127,7 @@ class SkikoProperties(private val myProject: Project) {
fun
skiaReleaseFor
(
os
:
OS
,
arch
:
Arch
,
buildType
:
SkiaBuildType
):
String
{
fun
skiaReleaseFor
(
os
:
OS
,
arch
:
Arch
,
buildType
:
SkiaBuildType
):
String
{
val
target
=
"${os.id}-${arch.id}"
val
target
=
"${os.id}-${arch.id}"
val
tag
=
myProject
.
property
(
"dependencies.skia.$target"
)
as
String
val
tag
=
myProject
.
property
(
"dependencies.skia.$target"
)
as
String
val
suffix
=
if
(
os
==
OS
.
Linux
&&
arch
==
Arch
.
X64
)
"-ubuntu1
4
"
else
""
val
suffix
=
if
(
os
==
OS
.
Linux
&&
arch
==
Arch
.
X64
)
"-ubuntu1
8
"
else
""
return
"${tag}/Skia-${tag}-${os.id}-${buildType.id}-${arch.id}$suffix"
return
"${tag}/Skia-${tag}-${os.id}-${buildType.id}-${arch.id}$suffix"
}
}
...
...
skiko/gradle.properties
View file @
27a93c41
...
@@ -2,13 +2,13 @@ kotlin.code.style=official
...
@@ -2,13 +2,13 @@ kotlin.code.style=official
deploy.version
=
0.0.0
deploy.version
=
0.0.0
kotlin.mpp.enableGranularSourceSetsMetadata
=
true
kotlin.mpp.enableGranularSourceSetsMetadata
=
true
dependencies.skia.windows-x64
=
m9
4-fd7c5792ca
dependencies.skia.windows-x64
=
m9
6-fd5bb8d130
dependencies.skia.linux-x64
=
m9
4-fd7c5792ca
dependencies.skia.linux-x64
=
m9
6-fd5bb8d130
dependencies.skia.macos-x64
=
m9
4-fd7c5792ca
dependencies.skia.macos-x64
=
m9
6-fd5bb8d130
dependencies.skia.linux-arm64
=
m9
4-fd7c5792ca
dependencies.skia.linux-arm64
=
m9
6-fd5bb8d130
dependencies.skia.macos-arm64
=
m9
4-fd7c5792ca
dependencies.skia.macos-arm64
=
m9
6-fd5bb8d130
dependencies.skia.wasm-wasm
=
m9
4-fd7c5792ca
dependencies.skia.wasm-wasm
=
m9
6-fd5bb8d130
dependencies.skia.ios-x64
=
m9
4-fd7c5792ca
dependencies.skia.ios-x64
=
m9
6-fd5bb8d130
dependencies.skia.ios-arm64
=
m9
4-fd7c5792ca
dependencies.skia.ios-arm64
=
m9
6-fd5bb8d130
org.gradle.jvmargs
=
-Xmx3G
org.gradle.jvmargs
=
-Xmx3G
skiko/src/macosMain/kotlin/org/jetbrains/skiko/SkiaLayer.macos.kt
View file @
27a93c41
...
@@ -15,10 +15,16 @@ actual open class SkiaLayer(
...
@@ -15,10 +15,16 @@ actual open class SkiaLayer(
get
()
=
_contentScale
get
()
=
_contentScale
actual
var
fullscreen
:
Boolean
actual
var
fullscreen
:
Boolean
get
()
=
TODO
(
"Not yet implemented"
)
get
()
=
false
set
(
value
)
{}
set
(
value
)
{
if
(
value
)
throw
IllegalArgumentException
(
"fullscreen unsupported"
)
}
actual
var
transparency
:
Boolean
=
false
actual
var
transparency
:
Boolean
get
()
=
false
set
(
value
)
{
if
(
value
)
throw
IllegalArgumentException
(
"transparency unsupported"
)
}
val
nsView
=
NSView
(
NSMakeRect
(
0.0
,
0.0
,
640.0
,
480.0
))
val
nsView
=
NSView
(
NSMakeRect
(
0.0
,
0.0
,
640.0
,
480.0
))
var
_contentScale
:
Float
=
1.0f
var
_contentScale
:
Float
=
1.0f
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment