X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_time.cpp;h=9458f1979bc1fdbedfe19fec287af176809df908;hb=e6e385d724df6e43dcf9846c947576d61feb29d1;hp=04b898bb30afba1f9a5958d7b0befdd410bf473a;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_time.cpp b/synfig-studio/trunk/src/gtkmm/widget_time.cpp
index 04b898b..9458f19 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_time.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_time.cpp
@@ -34,6 +34,8 @@
 #include "widget_time.h"
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -45,10 +47,6 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
-#if ! defined(_)
-#define _(x)	(x)
-#endif
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -135,6 +133,12 @@ Widget_Time::on_event(GdkEvent* event)
 		}
 		return true;
 		break;
+	case GDK_BUTTON_PRESS:
+	case GDK_2BUTTON_PRESS:
+	case GDK_3BUTTON_PRESS:
+		if (!has_focus())
+			grab_focus();
+		break;
 	default:
 		break;
 	}
@@ -153,6 +157,9 @@ Widget_Time::on_focus_out_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);
 }