nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-27 07:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid space when using Galley mode with multiple images on screen. Close #277

Browse Source
This commit is contained in:
nyne
2025-03-27 23:00:06 +08:00
parent d83d679eb9
commit 8d8e345d82
1 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/pages/reader/images.dart
View File

@@ -228,22 +228,54 @@ class _GalleryModeState extends State<_GalleryMode>
: Axis.horizontal;
bool reverse = reader.mode == ReaderMode.galleryRightToLeft;
List<Widget> imageWidgets = images.map((imageKey) {
ImageProvider imageProvider =
_createImageProviderFromKey(imageKey, context);
return Expanded(
child: ComicImage(
image: imageProvider,
fit: BoxFit.contain,
onInit: (state) => imageStates.add(state),
onDispose: (state) => imageStates.remove(state),
),
);
}).toList();
if (reverse) {
imageWidgets = imageWidgets.reversed.toList();
images = images.reversed.toList();
}
List<Widget> imageWidgets;
if (images.length == 2) {
imageWidgets = [
Expanded(
child: ComicImage(
width: double.infinity,
height: double.infinity,
image: _createImageProviderFromKey(images[0], context),
fit: BoxFit.contain,
alignment: axis == Axis.vertical
? Alignment.bottomCenter
: Alignment.centerRight,
onInit: (state) => imageStates.add(state),
onDispose: (state) => imageStates.remove(state),
),
),
Expanded(
child: ComicImage(
width: double.infinity,
height: double.infinity,
image: _createImageProviderFromKey(images[1], context),
fit: BoxFit.contain,
alignment: axis == Axis.vertical
? Alignment.topCenter
: Alignment.centerLeft,
onInit: (state) => imageStates.add(state),
onDispose: (state) => imageStates.remove(state),
),
)
];
} else {
imageWidgets = images.map((imageKey) {
ImageProvider imageProvider =
_createImageProviderFromKey(imageKey, context);
return Expanded(
child: ComicImage(
image: imageProvider,
fit: BoxFit.contain,
onInit: (state) => imageStates.add(state),
onDispose: (state) => imageStates.remove(state),
),
);
}).toList();
}
return axis == Axis.vertical
@@ -671,8 +703,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
}
Offset offset;
var sp = scrollController.position;
if (sp.pixels < sp.minScrollExtent
|| sp.pixels > sp.maxScrollExtent) {
if (sp.pixels < sp.minScrollExtent || sp.pixels > sp.maxScrollExtent) {
offset = Offset(value.dx, value.dy);
} else {
if (reader.mode == ReaderMode.continuousTopToBottom) {