From: Carl Hetherington <cth@carlh.net>
Date: Mon, 11 Apr 2016 22:05:22 +0000 (+0100)
Subject: Add similar rounding to subtitle offsets as already exist for scale,
X-Git-Tag: v2.7.12~7
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5e1c6b68d2577498b47489f3e08331722fc50de5

Add similar rounding to subtitle offsets as already exist for scale,
to try to fix strange sticking of spin buttons on arbitrary values.
---

diff --git a/ChangeLog b/ChangeLog
index a5c68e776..171f9d821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-04-11  Carl Hetherington  <cth@carlh.net>
 
+	* Hopefully fix strange limits on x/y offset of subtitles.
+
 	* Add UTC-3:30 timezone to Cinema configuration (#831).
 
 	* Add option to preview left or right eye (#809).
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index ad6a024e6..a53679673 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -190,9 +190,9 @@ SubtitlePanel::film_content_changed (int property)
 	} else if (property == SubtitleContentProperty::BURN_SUBTITLES) {
 		checked_set (_burn, scs ? scs->burn_subtitles() : false);
 	} else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
-		checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
+		checked_set (_x_offset, scs ? lrint (scs->subtitle_x_offset() * 100) : 0);
 	} else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
-		checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
+		checked_set (_y_offset, scs ? lrint (scs->subtitle_y_offset() * 100) : 0);
 	} else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) {
 		checked_set (_x_scale, scs ? lrint (scs->subtitle_x_scale() * 100) : 100);
 	} else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {