X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=a9a3f142dd60ce3773f5f2d0f8acb7965052f415;hb=82b08e910e07bb571b11368124d49dc3d73e33ca;hp=24646b78ac56704e1ee3636ff39a5ffcdac6d7c4;hpb=313319ba2d8544bc25524e02e634804a503b54f1;p=dcpomatic.git

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 24646b78a..a9a3f142d 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -45,7 +45,10 @@
 #include "lib/string_text_file_decoder.h"
 #include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -870,12 +873,12 @@ TextPanel::update_outline_subtitles_in_viewer ()
 		if (rect) {
 			auto content = _analysis_content.lock ();
 			DCPOMATIC_ASSERT (content);
-			rect->x += content->text.front()->x_offset();
-			rect->y += content->text.front()->y_offset();
+			rect->x += content->text.front()->x_offset() - _analysis->analysis_x_offset();
+			rect->y += content->text.front()->y_offset() - _analysis->analysis_y_offset();
 		}
 		fv->set_outline_subtitles (rect);
 	} else {
-		fv->set_outline_subtitles (optional<dcpomatic::Rect<double> >());
+		fv->set_outline_subtitles ({});
 	}
 }