summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-06 23:32:21 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-07 00:53:03 +0100
commit750d510316b8c006f7d0421d05af459272cb2795 (patch)
tree3297ca7d36260a0a2ba9d36201399fec63d7f89c /src
parent6783fd8c768c604bbe405636e32b10a878605d21 (diff)
Fix strange job status layout on OS X.
Diffstat (limited to 'src')
-rw-r--r--src/wx/job_manager_view.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 05dff36c5..1b809edec 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -48,14 +48,14 @@ public:
{
int n = 0;
- wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL);
+ _gauge_message = new wxBoxSizer (wxVERTICAL);
_gauge = new wxGauge (panel, wxID_ANY, 100);
/* This seems to be required to allow the gauge to shrink under OS X */
_gauge->SetMinSize (wxSize (0, -1));
- gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
+ _gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
_message = new wxStaticText (panel, wxID_ANY, wxT (" \n "));
- gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
- table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
+ _gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+ table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
++n;
_cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
@@ -100,6 +100,7 @@ private:
whole += _job->status ();
if (whole != _last_message) {
_message->SetLabelMarkup (std_to_wx (whole));
+ _gauge_message->Layout ();
_last_message = whole;
}
if (_job->progress ()) {
@@ -148,6 +149,7 @@ private:
boost::shared_ptr<Job> _job;
wxScrolledWindow* _window;
wxPanel* _panel;
+ wxBoxSizer* _gauge_message;
wxGauge* _gauge;
wxStaticText* _message;
wxButton* _cancel;