ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Item.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Item.pm (file contents):
Revision 1.12 by root, Sat Dec 29 13:44:29 2007 UTC vs.
Revision 1.15 by root, Sun Jan 11 23:50:27 2009 UTC

… …
66 on_escape => sub { $w->destroy; 1 }, 66 on_escape => sub { $w->destroy; 1 },
67 ); 67 );
68 $entry->grab_focus; 68 $entry->grab_focus;
69 $w->show; 69 $w->show;
70} 70}
71
72my $bg_cursed = [1 , 0 , 0, 0.5];
73my $bg_magic = [0.2, 0.2, 1, 0.5];
71 74
72sub update_widgets { 75sub update_widgets {
73 my ($self) = @_; 76 my ($self) = @_;
74 77
75 # necessary to avoid cyclic references 78 # necessary to avoid cyclic references
… …
163 . "Middle click - apply\n" 166 . "Middle click - apply\n"
164 . "Shift-Middle click - lock/unlock\n" 167 . "Shift-Middle click - lock/unlock\n"
165 . "Right click - further options" 168 . "Right click - further options"
166 . "</small>\n"; 169 . "</small>\n";
167 170
168 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 171 my $bg = $self->{flags} & F_CURSED ? $bg_cursed
169 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 172 : $self->{flags} & F_MAGIC ? $bg_magic
170 : undef; 173 : undef;
171 174
172 my $desc = DC::Item::desc_string $self; 175 my $desc = DC::Item::desc_string $self;
176 my $face_tooltip = "<b>$desc</b>\n\n$tooltip_std";
173 177
178 if (my $face = $self->{face_widget}) {
179 # already exists, so update if it changed
180 if ($face->{bg} != $bg) {
181 $face->{bg} = $bg;
182 $face->update;
183 }
184
185 $face->set_bg ($bg) if $face->{bg} != $bg;
186 $face->set_face ($self->{face}) if $face->{face} != $self->{face};
187 $face->set_anim ($self->{anim}) if $face->{anim} != $self->{anim};
188 $face->set_animspeed ($self->{animspeed}) if $face->{animspeed} != $self->{animspeed};
189
190 #$face->set_tooltip (
191 # "<b>Face/Animation.</b>\n"
192 # . "Item uses face #$self->{face}. "
193 # . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
194 # . "\n\n$tooltip_std"
195 #);
196 $face->set_tooltip ($face_tooltip);
197 } else {
198 # new object, create new face
174 $self->{face_widget} ||= new DC::UI::Face 199 $self->{face_widget} = new DC::UI::Face
175 can_events => 1, 200 can_events => 1,
176 can_hover => 1, 201 can_hover => 1,
202 bg => $bg,
203 face => $self->{face},
177 anim => $self->{anim}, 204 anim => $self->{anim},
178 animspeed => $self->{animspeed}, # TODO# must be set at creation time 205 animspeed => $self->{animspeed}, # TODO# must be set at creation time
206 tooltip => $face_tooltip,
179 on_button_down => $button_cb, 207 on_button_down => $button_cb,
208 ;
180 ; 209 }
181 $self->{face_widget}{bg} = $bg;
182 $self->{face_widget}{face} = $self->{face};
183 $self->{face_widget}{anim} = $self->{anim};
184 $self->{face_widget}{animspeed} = $self->{animspeed};
185# $self->{face_widget}->set_tooltip (
186# "<b>Face/Animation.</b>\n"
187# . "Item uses face #$self->{face}. "
188# . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
189# . "\n\n$tooltip_std"
190# );
191 $self->{face_widget}->set_tooltip ("<b>$desc</b>\n\n$tooltip_std");
192 210
193 $self->{desc_widget} ||= new DC::UI::Label 211 $self->{desc_widget} ||= new DC::UI::Label
194 can_events => 1, 212 can_events => 1,
195 can_hover => 1, 213 can_hover => 1,
196 ellipsise => 2, 214 ellipsise => 2,
… …
201 my ($widget) = @_; 219 my ($widget) = @_;
202 220
203 $::CONN && $::CONN->ex ($self->{tag}, sub { 221 $::CONN && $::CONN->ex ($self->{tag}, sub {
204 my ($long_desc) = @_; 222 my ($long_desc) = @_;
205 223
206 $long_desc =~ s/\s+$//; 224 $long_desc = DC::Protocol::sanitise_xml ($long_desc);
207 225
208 $self->{long_desc} = $long_desc; 226 $self->{long_desc} = $long_desc;
209 $widget->set_tooltip ("<b>$long_desc</b>\n\n$tooltip_std"); 227 $widget->set_tooltip ("<b>$long_desc</b>\n\n$tooltip_std");
210 }); 228 });
211 }, 229 },
212 ; 230 ;
213 231
214 $self->{desc_widget}{bg} = $bg; 232 my $long_desc = $self->{long_desc} || $desc;
233
234 $self->{desc_widget}->set_bg ($bg) if $self->{desc_widget}{bg} != $bg;
215 $self->{desc_widget}->set_text ($desc); 235 $self->{desc_widget}->set_text ($desc);
216
217 my $long_desc = $self->{long_desc} || $desc;
218 $self->{desc_widget}->set_tooltip ("<b>$long_desc</b>\n\n$tooltip_std"); 236 $self->{desc_widget}->set_tooltip ("<b>$long_desc</b>\n\n$tooltip_std");
219 237
220 $self->{weight_widget} ||= new DC::UI::Label 238 $self->{weight_widget} ||= new DC::UI::Label
221 can_events => 1, 239 can_events => 1,
222 can_hover => 1, 240 can_hover => 1,

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines