projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The recent changes to allow dragging of BLineCalcVertex ducks along the BLines they...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_time.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_time.cpp
b/synfig-studio/trunk/src/gtkmm/widget_time.cpp
index
f842ab8
..
105249f
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_time.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_time.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-119,13
+120,13
@@
Widget_Time::on_event(GdkEvent* event)
switch(event->type)
{
case GDK_SCROLL:
switch(event->type)
{
case GDK_SCROLL:
- if(event->scroll.direction==GDK_SCROLL_DOWN)
+ if(event->scroll.direction==GDK_SCROLL_DOWN
|| event->scroll.direction==GDK_SCROLL_LEFT
)
{
time_-=scroll_amount;
refresh_text();
signal_value_changed()();
}
{
time_-=scroll_amount;
refresh_text();
signal_value_changed()();
}
- else if(event->scroll.direction==GDK_SCROLL_UP)
+ else if(event->scroll.direction==GDK_SCROLL_UP
|| event->scroll.direction==GDK_SCROLL_RIGHT
)
{
time_+=scroll_amount;
refresh_text();
{
time_+=scroll_amount;
refresh_text();
@@
-157,6
+158,9
@@
Widget_Time::on_focus_out_event(GdkEventFocus* event)
bool
Widget_Time::on_focus_in_event(GdkEventFocus* event)
{
bool
Widget_Time::on_focus_in_event(GdkEventFocus* event)
{
- set_text(time_.get_string(fps_,App::get_time_format()|Time::FORMAT_FULL));
+ // if defined, show the full time format "0h 0m 5s 0f" when the time widget gets focus
+ if (getenv("SYNFIG_SHOW_FULL_TIME_ON_FOCUS"))
+ set_text(time_.get_string(fps_,App::get_time_format()|Time::FORMAT_FULL));
+
return Gtk::Entry::on_focus_in_event(event);
}
return Gtk::Entry::on_focus_in_event(event);
}