From 1e642dc805ad8caf582007d039717f912ad4e33a Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 1 Nov 2016 23:25:54 +0100 Subject: [PATCH] Inv(#1020): remove debugging output ...done thus far! --- src/gui/panel/timeline-panel.cpp | 32 +++++++++----------------------- src/gui/panel/timeline-panel.hpp | 4 ++-- wiki/renderengine.html | 13 ++++++------- wiki/thinkPad.ichthyo.mm | 11 +++++++---- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/gui/panel/timeline-panel.cpp b/src/gui/panel/timeline-panel.cpp index 9e097b8a0..7ceab8a5d 100644 --- a/src/gui/panel/timeline-panel.cpp +++ b/src/gui/panel/timeline-panel.cpp @@ -256,48 +256,34 @@ namespace panel { Gtk::Container::ForeachSlot callback = [&](Gtk::Widget& chld) { - cout << "hoya "< const& cox) { if (shallDraw_) { - int h = get_allocation().get_width(); - int v = get_allocation().get_height(); - uint extH=20, extV=20; + uint extH, extV; determineExtension(); get_size (extH, extV); auto adjH = get_hadjustment(); auto adjV = get_vadjustment(); - - cout << "draw h:"<get_lower() % adjH->get_value() % adjH->get_upper()) - << string(debugAdj % "V" % adjV->get_lower() % adjV->get_value() % adjV->get_upper()) - << endl; - double offH = adjH->get_value(); double offV = adjV->get_value(); + cox->save(); cox->translate(-offH, -offV); @@ -310,7 +296,7 @@ namespace panel { cox->restore(); // cause child widgets to be redrawn - Gtk::Layout::on_draw(cox); + bool event_is_handled = Gtk::Layout::on_draw(cox); // any drawing which follows happens on top of child widgets... cox->save(); @@ -322,7 +308,7 @@ namespace panel { cox->stroke(); cox->restore(); - return false; + return event_is_handled; } else return Gtk::Layout::on_draw(cox); diff --git a/src/gui/panel/timeline-panel.hpp b/src/gui/panel/timeline-panel.hpp index 3e1b38e6b..24adf9a1c 100644 --- a/src/gui/panel/timeline-panel.hpp +++ b/src/gui/panel/timeline-panel.hpp @@ -98,10 +98,10 @@ namespace panel { * * \par Plan of investigation * 1. place some simple widgets (Buttons) ✔ - * 2. learn how to draw + * 2. learn how to draw ✔ * 3. place a huge number of widgets, to scrutinise scrolling and performance * 4. place widgets overlapping and irregularily, beyond the scrollable area ✔ - * 5. bind signals to those widgets, to verify event dispatching + * 5. bind signals to those widgets, to verify event dispatching ✔ * 6. bind some further signal(s) to the ~GtkLayout container * 7. hide and re-show a partially and a totally overlapped widget * 8. find a way to move a widget ✔ and delete arbitrary widgets ✔ diff --git a/wiki/renderengine.html b/wiki/renderengine.html index f14b614cc..cdf65b7a0 100644 --- a/wiki/renderengine.html +++ b/wiki/renderengine.html @@ -2648,7 +2648,7 @@ In the most general case, there can be per-track content and nested content at t &rarr; important question: how to [[organise the widgets|GuiTimelineWidgetStructure]] -
+
The Timeline is probably the most prominent place in the GUI where we need to come up with a custom UI design.
 Instead of combining standard components in one of the well-known ways, here we need to come up with our own handling solution -- which also means to write one or several custom GTK widgets. Thus the question of layout and screen space division and organisation becomes a crucial design decision. The ~GTK-2 Gui, as implemented currently, did already take some steps along this route, yet this kind of decision should be cast and documented explicitly (be it after the fact).
 
@@ -2746,12 +2746,11 @@ In order to build a sensible plan for our timeline structure, we need to investi
       Gtk::Container::ForeachSlot callback
         = [&](Gtk::Widget& chld)
                 {
-                  cout << "hoya "<<chld;
-                  auto allo = chld.get_allocation();
-                  uint x = allo.get_x();
-                  uint y = allo.get_y();
-                  x += allo.get_width();
-                  y += allo.get_height();
+                  auto alloc = chld.get_allocation();
+                  uint x = alloc.get_x();
+                  uint y = alloc.get_y();
+                  x += alloc.get_width();
+                  y += alloc.get_height();
                   extH = max (extH, x);
                   extV = max (extV, y);
                 };
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index 56479b5b9..d2ed36f4b 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -9389,9 +9389,10 @@
 
 
 
-
+
 
 
+
 
 
 
@@ -9425,7 +9426,7 @@
 
 
 
-
+
 
 
 
@@ -9590,17 +9591,19 @@
 
 
 
-
+
 
 
+
 
 
 
 
 
-
+
 
 
+