jlengrand/compose-multiplatform
1
0
Fork 0
mirror of https://github.com/jlengrand/compose-multiplatform.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed loading screen when click on miniature.

Browse Source
This commit is contained in:
Roman Sedaikin
2020-10-20 17:53:32 +03:00
parent 79ddbaf7bd
commit f440b6ddee
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/model/ContentState.kt
View File

@@ -228,6 +228,7 @@ object ContentState {
val fullSizePicture = loadFullImage(picture.source)
fullSizePicture.id = picture.id
wrapPictureIntoMainImage(fullSizePicture)
isAppUIReady.value = true
}
} else {
invokeLater {
@@ -235,6 +236,7 @@ object ContentState {
"${ResString.noInternet}\n${ResString.loadImageUnavailable}"
)
wrapPictureIntoMainImage(picture)
isAppUIReady.value = true
}
}
}

34
examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/MainScreen.kt
View File

@@ -145,7 +145,8 @@ fun setTitleBar(text: String, content: ContentState) {
onExit = {
refreshButtonHover.value = false
false
})
}
)
.background(color = if (refreshButtonHover.value) TranslucentBlack else Transparent),
onClick = {
if (content.isContentReady()) {
@@ -169,7 +170,8 @@ fun setPreviewImageUI(content: ContentState) {
modifier = Modifier.background(color = DarkGray),
onClick = {
AppState.screenState(ScreenType.FullscreenImage)
}) {
}
) {
Card(
backgroundColor = Transparent,
modifier = Modifier.preferredHeight(250.dp),
@@ -217,9 +219,9 @@ fun setMiniatureUI(
) {
Row(modifier = Modifier.padding(end = 30.dp)) {
Clickable(
onClick = {
content.fullscreen(picture)
}
onClick = {
content.fullscreen(picture)
}
) {
Image(
Image.makeFromEncoded(
@@ -243,17 +245,17 @@ fun setMiniatureUI(
Clickable(
modifier = Modifier.preferredHeight(70.dp)
.preferredWidth(30.dp)
.hover(
onEnter = {
infoButtonHover.value = true
false
},
onExit = {
infoButtonHover.value = false
false
})
.background(color = if (infoButtonHover.value) TranslucentWhite else Transparent),
.preferredWidth(30.dp)
.hover(
onEnter = {
infoButtonHover.value = true
false
},
onExit = {
infoButtonHover.value = false
false
})
.background(color = if (infoButtonHover.value) TranslucentWhite else Transparent),
onClick = {
showPopUpMessage(
"${ResString.picture} " +