Show exercises on primary monitor

rcaelers · Nov 25, 2023 · 6a33df9 · 6a33df9
1 parent 56f68da
commit 6a33df9
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 60 deletions.
diff --git a/changes.yaml b/changes.yaml
@@ -1,5 +1,12 @@
 ---
 releases:
+  - version: 1.11.0-beta.8
+    date: 2023-11-26T00:00:00+01:00
+    short: |-
+      Workrave 1.11.0-beta.8 has been released.
+    changes:
+      - Workrave now always shows the exercises during a restbreak on the primary monitor
+
   - version: 1.11.0-beta.7
     date: 2023-08-14T22:34:36+02:00
     short: |-

diff --git a/tools/citool/package-lock.json b/tools/citool/package-lock.json
diff --git a/ui/app/Application.cc b/ui/app/Application.cc
@@ -410,8 +410,6 @@ Application::create_break_window(BreakId break_id, workrave::utils::Flags<BreakH
 
       break_windows.push_back(break_window);
       break_window->init();
-
-      break_flags |= BREAK_FLAGS_NO_EXERCISES;
     }
 }
 

diff --git a/ui/app/toolkits/gtkmm/HeadInfo.cc b/ui/app/toolkits/gtkmm/HeadInfo.cc
@@ -46,3 +46,9 @@ HeadInfo::get_y() const
 {
   return geometry.get_y();
 }
+
+bool
+HeadInfo::is_primary() const
+{
+  return primary;
+}
diff --git a/ui/app/toolkits/gtkmm/HeadInfo.hh b/ui/app/toolkits/gtkmm/HeadInfo.hh
@@ -33,8 +33,9 @@ public:
   int get_height() const;
   int get_x() const;
   int get_y() const;
+  bool is_primary() const;
 
-  int monitor{0};
+  bool primary{false};
   Gdk::Rectangle geometry;
 };
 

diff --git a/ui/app/toolkits/gtkmm/RestBreakWindow.cc b/ui/app/toolkits/gtkmm/RestBreakWindow.cc
@@ -210,7 +210,7 @@ RestBreakWindow::get_exercise_count()
 void
 RestBreakWindow::install_exercises_panel()
 {
-  if (head.monitor != 0 || (break_flags & BREAK_FLAGS_NO_EXERCISES))
+  if (!head.is_primary() || ((break_flags & BREAK_FLAGS_NO_EXERCISES) != 0))
     {
       install_info_panel();
     }
@@ -242,7 +242,7 @@ RestBreakWindow::install_info_panel()
   pluggable_panel->queue_resize();
 
   BlockMode block_mode = GUIConfig::block_mode()();
-  if (block_mode == BlockMode::Off && head.monitor == 0)
+  if (block_mode == BlockMode::Off && head.is_primary())
     {
       Gtk::Requisition new_size;
       get_preferred_size(new_size, natural_size);

diff --git a/ui/app/toolkits/gtkmm/Toolkit.cc b/ui/app/toolkits/gtkmm/Toolkit.cc
@@ -142,7 +142,7 @@ Toolkit::get_head_info(int screen_index) const
   Glib::RefPtr<Gdk::Monitor> monitor = display->get_monitor(screen_index);
 
   HeadInfo head;
-  head.monitor = screen_index;
+  head.primary = monitor->is_primary();
   monitor->get_geometry(head.geometry);
 
   return head;
@@ -429,7 +429,6 @@ Toolkit::init_multihead()
   TRACE_ENTRY();
   Glib::RefPtr<Gdk::Display> display = Gdk::Display::get_default();
   Glib::RefPtr<Gdk::Screen> screen = display->get_default_screen();
-  // screen->signal_monitors_changed().connect(sigc::mem_fun(*this, &Application::update_multihead));
 }
 
 void
-Original file line number
+Diff line change
@@ Expand Up @@
           break_windows.push_back(break_window);
           break_window->init();
-          break_flags |= BREAK_FLAGS_NO_EXERCISES;
         }
     }
@@ Expand Down @@