mirror of
				https://github.com/rad4day/Waybar.git
				synced 2025-11-04 09:42:42 +01:00 
			
		
		
		
	Merge pull request #579 from alebastr/date-fractional-seconds
fix(clock): lower precision of zoned_time to avoid fractional seconds in output
This commit is contained in:
		@@ -14,7 +14,7 @@ namespace waybar::modules {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
struct waybar_time {
 | 
					struct waybar_time {
 | 
				
			||||||
  std::locale locale;
 | 
					  std::locale locale;
 | 
				
			||||||
  date::zoned_time<std::chrono::system_clock::duration> ztime;
 | 
					  date::zoned_seconds ztime;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Clock : public ALabel {
 | 
					class Clock : public ALabel {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,8 @@ auto waybar::modules::Clock::update() -> void {
 | 
				
			|||||||
    time_zone_ = date::current_zone();
 | 
					    time_zone_ = date::current_zone();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  auto        now = std::chrono::system_clock::now();
 | 
					  auto        now = std::chrono::system_clock::now();
 | 
				
			||||||
  waybar_time wtime = {locale_, date::make_zoned(time_zone_, now)};
 | 
					  waybar_time wtime = {locale_,
 | 
				
			||||||
 | 
					                       date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  auto text = fmt::format(format_, wtime);
 | 
					  auto text = fmt::format(format_, wtime);
 | 
				
			||||||
  label_.set_markup(text);
 | 
					  label_.set_markup(text);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user