… | |
… | |
26 | text => $k, |
26 | text => $k, |
27 | fontsize => 0.2, |
27 | fontsize => 0.2, |
28 | ); |
28 | ); |
29 | |
29 | |
30 | my $marker = $ws->new (Face => |
30 | my $marker = $ws->new (Face => |
31 | size_w => undef, |
|
|
32 | size_h => undef, |
|
|
33 | face => $ws->{ns}->find_face ("res/map-arrow.png"), |
31 | face => $ws->{ns}->need_face ("res/map-arrow"), |
34 | ); |
32 | ); |
35 | my $children = [$label, $marker]; |
33 | my $children = [$label, $marker]; |
36 | |
34 | |
37 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
35 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
38 | children => $children, |
36 | children => $children, |
… | |
… | |
70 | x => "center", |
68 | x => "center", |
71 | y => "center", |
69 | y => "center", |
72 | has_close_button => 1, |
70 | has_close_button => 1, |
73 | on_delete => sub { shift->hide }, |
71 | on_delete => sub { shift->hide }, |
74 | on_visibility_change => sub { |
72 | on_visibility_change => sub { |
75 | warn "VCHANGE <@_>\n";#d# |
|
|
76 | $_[0]{visibility} = $_[1]; |
73 | $_[0]{visibility} = $_[1]; |
77 | update_worldmap $_[0]{ws} if $_[1]; |
74 | update_worldmap $_[0]{ws} if $_[1]; |
78 | }, |
75 | }, |
79 | ); |
76 | ); |
80 | |
77 | |
81 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
78 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
82 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
79 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
83 | |
80 | |
84 | $ws->{mapface} = $ws->new (Face => |
81 | $ws->{mapface} = $ws->new (Face => |
85 | expand => 1, |
|
|
86 | size_w => undef, |
82 | size_w => undef, |
87 | size_h => undef, |
83 | size_h => undef, |
88 | face => $ws->{ns}->find_face ("res/worldmap.jpg"), |
84 | face => $ws->{ns}->need_face ("res/worldmap"), |
89 | ); |
85 | ); |
90 | |
86 | |
91 | $ws->{canvas}->add ($ws->{mapface}); |
87 | $ws->{canvas}->add ($ws->{mapface}); |
92 | |
88 | |
93 | $ws |
89 | $ws |