From 8ee9ec79d8c14f5f23b21a7e7f512a9d8e7a809e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 27 Jul 2012 23:39:08 +0100
Subject: Fix thumb update on format change.

---
 src/wx/film_viewer.cc | 24 ++++++++++++------------
 src/wx/film_viewer.h  |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f75efd728..a7b8a9550 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -109,6 +109,12 @@ public:
 		_image = 0;
 	}
 
+	void refresh ()
+	{
+		setup ();
+		Refresh ();
+	}
+
 	DECLARE_EVENT_TABLE ();
 
 private:
@@ -173,7 +179,7 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
 	int const max = f ? f->num_thumbs() - 1 : 0;
 	_slider = new wxSlider (this, wxID_ANY, 0, 0, max);
 	_sizer->Add (_slider, 0, wxEXPAND | wxLEFT | wxRIGHT);
-	load_thumbnail (0);
+	set_thumbnail (0);
 
 	_slider->Connect (wxID_ANY, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEventHandler (FilmViewer::slider_changed), 0, this);
 
@@ -181,7 +187,7 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
 }
 
 void
-FilmViewer::load_thumbnail (int n)
+FilmViewer::set_thumbnail (int n)
 {
 	if (_film == 0 || _film->num_thumbs() <= n) {
 		return;
@@ -190,16 +196,10 @@ FilmViewer::load_thumbnail (int n)
 	_thumb_panel->set (_film->thumb_file(n));
 }
 
-void
-FilmViewer::reload_current_thumbnail ()
-{
-	load_thumbnail (_slider->GetValue ());
-}
-
 void
 FilmViewer::slider_changed (wxCommandEvent &)
 {
-	reload_current_thumbnail ();
+	set_thumbnail (_slider->GetValue ());
 }
 
 void
@@ -216,9 +216,9 @@ FilmViewer::film_changed (Film::Property p)
 		}
 		
 		_slider->SetValue (0);
-		reload_current_thumbnail ();
+		_thumb_panel->refresh ();
 	} else if (p == Film::FORMAT) {
-		reload_current_thumbnail ();
+		_thumb_panel->refresh ();
 	} else if (p == Film::CONTENT) {
 		setup_visibility ();
 		_film->examine_content ();
@@ -238,7 +238,7 @@ FilmViewer::set_film (Film* f)
 
 	_film->Changed.connect (sigc::mem_fun (*this, &FilmViewer::film_changed));
 	film_changed (Film::THUMBS);
-	reload_current_thumbnail ();
+	_thumb_panel->refresh ();
 	setup_visibility ();
 }
 
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 8a1a0c908..58474c6ba 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -40,9 +40,8 @@ public:
 private:
 	void slider_changed (wxCommandEvent &);
 	void update_thumbs ();
-	void load_thumbnail (int);
+	void set_thumbnail (int);
 	void film_changed (Film::Property);
-	void reload_current_thumbnail ();
 
 	Film* _film;
 	wxBoxSizer* _sizer;
-- 
cgit v1.2.3