From 99ca93cb9021a7bcb1824b58bf40902993d7e573 Mon Sep 17 00:00:00 2001
From: Jeremy Bullock <jcbullock@gmail.com>
Date: Jun 04 2016 07:01:44 +0000
Subject: Ruler tool now working too


---

diff --git a/toonz/sources/tnztools/tooloptions.cpp b/toonz/sources/tnztools/tooloptions.cpp
index 5d6dcb9..08bd8a3 100644
--- a/toonz/sources/tnztools/tooloptions.cpp
+++ b/toonz/sources/tnztools/tooloptions.cpp
@@ -1798,6 +1798,15 @@ RulerToolOptionsBox::RulerToolOptionsBox(QWidget *parent,
 
 	m_Afld->setMeasure("angle");
 
+	if (Preferences::instance()->getUnits() == "pixel")
+	{
+		m_Xfld->setMeasure("camera.lx");
+		m_Yfld->setMeasure("camera.lx");
+		m_Wfld->setMeasure("camera.lx");
+		m_Hfld->setMeasure("camera.lx");
+		m_Lfld->setMeasure("camera.lx");
+	}
+
 	m_Xfld->setObjectName("RulerToolOptionValues");
 	m_Yfld->setObjectName("RulerToolOptionValues");
 	m_Wfld->setObjectName("RulerToolOptionValues");