From 3f0886f27067e92728c5cbd204f367f7f60f8fb6 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Wed, 24 Nov 2021 18:03:36 +0100 Subject: New upstream version 0.27 --- Build.PL | 2 +- Changes | 6 ++++++ MANIFEST | 1 + META.json | 12 ++++++------ META.yml | 10 +++++----- Makefile.PL | 18 ++++++++++++++++++ lib/Tickit/Widget/Scroller.pm | 12 ++++++------ lib/Tickit/Widget/Scroller/Item/RichText.pm | 8 ++++---- lib/Tickit/Widget/Scroller/Item/Text.pm | 10 ++++++---- 9 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 Makefile.PL diff --git a/Build.PL b/Build.PL index f6036a1..0c6aa08 100644 --- a/Build.PL +++ b/Build.PL @@ -7,7 +7,7 @@ my $build = Module::Build->new( module_name => 'Tickit::Widget::Scroller', requires => { 'perl' => '5.026', # signatures - 'Object::Pad' => '0.41', + 'Object::Pad' => '0.57', 'String::Tagged' => 0, 'Tickit::RenderBuffer' => '0.43', # flush_to_term diff --git a/Changes b/Changes index f05958e..d8bbd5b 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,11 @@ Revision history for Tickit-Widget-Scroller +0.27 2021-11-20 + [CHANGES] + * Updates for Object::Pad 0.57 + + Use :isa instead of legacy `extends` + + Use BUILDARGS and ADJUSTPARAMS instead of BUILD + 0.26 2021-07-03 [CHANGES] * Updates for Object::Pad 0.41: diff --git a/MANIFEST b/MANIFEST index 9269b80..7202cf5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -7,6 +7,7 @@ lib/Tickit/Widget/Scroller/Item.pod lib/Tickit/Widget/Scroller/Item/RichText.pm lib/Tickit/Widget/Scroller/Item/Text.pm LICENSE +Makefile.PL MANIFEST This list of files META.json META.yml diff --git a/META.json b/META.json index b20813d..01e8bc1 100644 --- a/META.json +++ b/META.json @@ -16,7 +16,7 @@ "prereqs" : { "runtime" : { "requires" : { - "Object::Pad" : "0.41", + "Object::Pad" : "0.57", "String::Tagged" : "0", "Tickit::Pen" : "0.19", "Tickit::RenderBuffer" : "0.43", @@ -35,15 +35,15 @@ "provides" : { "Tickit::Widget::Scroller" : { "file" : "lib/Tickit/Widget/Scroller.pm", - "version" : "0.26" + "version" : "0.27" }, "Tickit::Widget::Scroller::Item::RichText" : { "file" : "lib/Tickit/Widget/Scroller/Item/RichText.pm", - "version" : "0.26" + "version" : "0.27" }, "Tickit::Widget::Scroller::Item::Text" : { "file" : "lib/Tickit/Widget/Scroller/Item/Text.pm", - "version" : "0.26" + "version" : "0.27" } }, "release_status" : "stable", @@ -53,6 +53,6 @@ ], "x_IRC" : "irc://irc.freenode.net/#tickit" }, - "version" : "0.26", - "x_serialization_backend" : "JSON::PP version 4.04" + "version" : "0.27", + "x_serialization_backend" : "JSON::PP version 4.05" } diff --git a/META.yml b/META.yml index 7ac30c4..084fb35 100644 --- a/META.yml +++ b/META.yml @@ -15,15 +15,15 @@ name: Tickit-Widget-Scroller provides: Tickit::Widget::Scroller: file: lib/Tickit/Widget/Scroller.pm - version: '0.26' + version: '0.27' Tickit::Widget::Scroller::Item::RichText: file: lib/Tickit/Widget/Scroller/Item/RichText.pm - version: '0.26' + version: '0.27' Tickit::Widget::Scroller::Item::Text: file: lib/Tickit/Widget/Scroller/Item/Text.pm - version: '0.26' + version: '0.27' requires: - Object::Pad: '0.41' + Object::Pad: '0.57' String::Tagged: '0' Tickit::Pen: '0.19' Tickit::RenderBuffer: '0.43' @@ -33,5 +33,5 @@ requires: resources: IRC: irc://irc.freenode.net/#tickit license: http://dev.perl.org/licenses/ -version: '0.26' +version: '0.27' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/Makefile.PL b/Makefile.PL new file mode 100644 index 0000000..d8d3a0b --- /dev/null +++ b/Makefile.PL @@ -0,0 +1,18 @@ +# Note: this file was auto-generated by Module::Build::Compat version 0.4220 +use ExtUtils::MakeMaker; +WriteMakefile +( + 'NAME' => 'Tickit::Widget::Scroller', + 'VERSION_FROM' => 'lib/Tickit/Widget/Scroller.pm', + 'PREREQ_PM' => { + 'String::Tagged' => 0, + 'Tickit::Pen' => '0.19', + 'Tickit::RenderBuffer' => '0.43', + 'Tickit::Widget' => '0.35', + 'Tickit::Window' => '0.57' + }, + 'INSTALLDIRS' => 'site', + 'EXE_FILES' => [], + 'PL_FILES' => {} +) +; diff --git a/lib/Tickit/Widget/Scroller.pm b/lib/Tickit/Widget/Scroller.pm index 87ecba6..e47beeb 100644 --- a/lib/Tickit/Widget/Scroller.pm +++ b/lib/Tickit/Widget/Scroller.pm @@ -1,14 +1,14 @@ # You may distribute under the terms of either the GNU General Public License # or the Artistic License (the same terms as Perl itself) # -# (C) Paul Evans, 2011-2020 -- leonerd@leonerd.org.uk +# (C) Paul Evans, 2011-2021 -- leonerd@leonerd.org.uk use v5.26; # signatures -use Object::Pad 0.41; +use Object::Pad 0.57; -package Tickit::Widget::Scroller 0.26; +package Tickit::Widget::Scroller 0.27; class Tickit::Widget::Scroller - extends Tickit::Widget; + :isa(Tickit::Widget); use Tickit::Style; Tickit::Widget->VERSION( '0.35' ); @@ -166,9 +166,9 @@ has $_on_scrolled :param :reader :writer = undef; has $_gen_top_indicator :param = undef; has $_gen_bottom_indicator :param = undef; -BUILD ( %args ) +ADJUSTPARAMS ( $params ) { - my $gravity = delete $args{gravity} || "top"; + my $gravity = ( delete $params->{gravity} ) || "top"; $_gravity_bottom = ( $gravity eq "bottom" ); } diff --git a/lib/Tickit/Widget/Scroller/Item/RichText.pm b/lib/Tickit/Widget/Scroller/Item/RichText.pm index 38a7f37..c532fa8 100644 --- a/lib/Tickit/Widget/Scroller/Item/RichText.pm +++ b/lib/Tickit/Widget/Scroller/Item/RichText.pm @@ -1,13 +1,13 @@ # You may distribute under the terms of either the GNU General Public License # or the Artistic License (the same terms as Perl itself) # -# (C) Paul Evans, 2011-2020 -- leonerd@leonerd.org.uk +# (C) Paul Evans, 2011-2021 -- leonerd@leonerd.org.uk -use Object::Pad 0.17; +use Object::Pad 0.57; -package Tickit::Widget::Scroller::Item::RichText 0.26; +package Tickit::Widget::Scroller::Item::RichText 0.27; class Tickit::Widget::Scroller::Item::RichText - extends Tickit::Widget::Scroller::Item::Text; + :isa(Tickit::Widget::Scroller::Item::Text); use Tickit::Utils qw( textwidth ); diff --git a/lib/Tickit/Widget/Scroller/Item/Text.pm b/lib/Tickit/Widget/Scroller/Item/Text.pm index e4c82f5..21051ca 100644 --- a/lib/Tickit/Widget/Scroller/Item/Text.pm +++ b/lib/Tickit/Widget/Scroller/Item/Text.pm @@ -5,7 +5,7 @@ use Object::Pad 0.27; -package Tickit::Widget::Scroller::Item::Text 0.26; +package Tickit::Widget::Scroller::Item::Text 0.27; class Tickit::Widget::Scroller::Item::Text; use Tickit::Utils qw( textwidth cols2chars ); @@ -57,17 +57,19 @@ amount. Does not apply to the first line. =cut +sub BUILDARGS ( $class, $text, %opts ) { return ( text => $text, %opts ) } + has $_indent; has @_chunks; has $_width; # width for which the @_lineruns are valid has @_lineruns; -BUILD ( $text, %opts ) +ADJUSTPARAMS ( $params ) { - $_indent = $opts{indent} if defined $opts{indent}; + $_indent = delete $params->{indent} if exists $params->{indent}; - @_chunks = $self->_build_chunks_for( $text ); + @_chunks = $self->_build_chunks_for( delete $params->{text} ); } =head1 METHODS -- cgit v1.2.3