Skip to content

Commit

Permalink
Merge pull request #108 from MarcelGarus/2.3
Browse files Browse the repository at this point in the history
2.3
  • Loading branch information
realitymolder authored Sep 30, 2024
2 parents 59949f4 + e25c691 commit 06a6cb1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
10 changes: 8 additions & 2 deletions lib/marquee.dart
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ class _MarqueeState extends State<Marquee> with SingleTickerProviderStateMixin {
@override
void dispose() {
_running = false;
_controller.dispose();
super.dispose();
}

Expand Down Expand Up @@ -730,8 +731,13 @@ class _MarqueeState extends State<Marquee> with SingleTickerProviderStateMixin {
physics: NeverScrollableScrollPhysics(),
itemBuilder: (_, i) {
final text = i.isEven
? Text(widget.text,
style: widget.style, textScaleFactor: widget.textScaleFactor)
? Text(
widget.text,
style: widget.style,
textScaler: widget.textScaleFactor != null
? TextScaler.linear(widget.textScaleFactor!)
: null,
)
: _buildBlankSpace();
return alignment == null
? text
Expand Down
13 changes: 6 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: marquee
description: 'A Flutter widget that scrolls text infinitely. Provides many
description: "A Flutter widget that scrolls text infinitely. Provides many
customizations including custom scroll directions, durations, curves as well
as pauses after every round.'
version: 2.2.3
as pauses after every round."
version: 2.3.0
repository: https://github.com/MarcelGarus/marquee

environment:
flutter: '>=3.0.0'
sdk: '>=2.17.0 <3.0.0'

flutter: ">=3.0.0"
sdk: "^3.5.0"
dependencies:
fading_edge_scrollview: ^3.0.0
fading_edge_scrollview: ^4.1.1
flutter:
sdk: flutter

Expand Down

0 comments on commit 06a6cb1

Please sign in to comment.