Changing the clocklabel to work with the timerThread signal
* src/minefield.hpp:
This commit is contained in:
@@ -163,20 +163,22 @@ void MainWindow::gameOver() {
|
||||
//std::cout << "Signal gameOver emmited\n";
|
||||
}
|
||||
|
||||
bool MainWindow::updateClockLabel()
|
||||
void MainWindow::updateClockLabel(size_t time)
|
||||
{
|
||||
++m_elapsedTime;
|
||||
//++m_elapsedTime;
|
||||
|
||||
int deciseconds = m_elapsedTime % 10;
|
||||
int seconds = (m_elapsedTime / 10) % 60;
|
||||
int minutes = (m_elapsedTime /600) % 60;
|
||||
//int deciseconds = m_elapsedTime % 10;
|
||||
//int seconds = (m_elapsedTime / 10) % 60;
|
||||
//int minutes = (m_elapsedTime /600) % 60;
|
||||
|
||||
Glib::ustring msg = Glib::ustring::compose("Elapsed time: %1:%2.%3", \
|
||||
Glib::ustring::format(std::setfill(L'0'), std::setw(2), minutes), \
|
||||
Glib::ustring::format(std::setfill(L'0'), std::setw(2), seconds), \
|
||||
Glib::ustring::format(std::setfill(L'0'), std::setw(1), deciseconds));
|
||||
Glib::ustring msg = Glib::ustring::compose("Elapsed time: %1", time);
|
||||
|
||||
// Glib::ustring msg = Glib::ustring::compose("Elapsed time: %1:%2.%3", \
|
||||
// Glib::ustring::format(std::setfill(L'0'), std::setw(2), minutes), \
|
||||
// Glib::ustring::format(std::setfill(L'0'), std::setw(2), seconds), \
|
||||
// Glib::ustring::format(std::setfill(L'0'), std::setw(1), deciseconds));
|
||||
clockLabel.set_label(msg);
|
||||
return true;
|
||||
//return true;
|
||||
}
|
||||
|
||||
MainWindow::MainWindow()
|
||||
@@ -273,9 +275,10 @@ MainWindow::MainWindow()
|
||||
|
||||
//optionButton.set_icon_name("open-menu");
|
||||
|
||||
field.timerSignal.connect(sigc::bind(sigc::mem_fun(*this, &MainWindow::updateClockLabel)));
|
||||
//if (clockSignalConn.connected()) clockSignalConn.disconnect();
|
||||
//elapsedTime = 0;
|
||||
clockSignalConn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::updateClockLabel), 100);
|
||||
//clockSignalConn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::updateClockLabel), 100);
|
||||
//}
|
||||
//create the minefield
|
||||
//field = new MineField(COLS, MINES);
|
||||
|
||||
Reference in New Issue
Block a user