nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grow the clock if the text gets too big

Browse source
This commit is contained in:
simonb 2006-04-17 13:36:59 +00:00
parent 9ff23f01ca
commit a211ca912d
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
(Format: Year/Month/Day)
Changes for 0.9.16:
*06/04/17:
* Resize the clock if the text gets too big, sf.net patch #1436406
(thanks Geoff Lywood - glywood at users.sourceforge.net)
ClockTool.cc
* Fix some rotated toolbar+textbutton issues (Simon)
Toolbar.cc IconbarTool.cc FbTk/TextButton.cc
* Fix /bin/sh portability for fbsetbg and startfluxbox (Simon)

10
src/ClockTool.cc
View file

@ -249,14 +249,22 @@ void ClockTool::updateTime() {
if (the_time != -1) {
char time_string[255];
int time_string_len;
struct tm *time_type = localtime(&the_time);
if (time_type == 0)
return;
#ifdef HAVE_STRFTIME
if (!strftime(time_string, 255, m_timeformat->c_str(), time_type) || m_button.text() == time_string)
time_string_len = strftime(time_string, 255, m_timeformat->c_str(), time_type);
if( time_string_len == 0 || m_button.text() == time_string)
return;
m_button.setText(time_string);
int new_width = m_theme.font().textWidth(time_string, time_string_len) + 2;
if (new_width > m_button.width()) {
resize(new_width, m_button.height());
resizeSig().notify();
}
#else // dont have strftime so we have to set it to hour:minut
// sprintf(time_string, "%d:%d", );
#endif // HAVE_STRFTIME