Not so soon, I guess, since that FIXME was from r6305.

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index f1583d193cebc289b071b6ad21bb1a6089af355c..a711a2a416e14a303ba8a055dfb62b1887d19cbb 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
@@ -13,6 +13,7 @@
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
+#include "Changes.h"
 #include "ColorCode.h"
 #include "FontInfo.h"
 
@@ -26,6 +27,7 @@ class BufferView;
 namespace lyx {
 
 namespace frontend { class Painter; }
+class Inset;
 class MacroContext;
 
 
@@ -95,6 +97,11 @@ public:
        void draw(int x, int y, char_type c);
        ///
        void draw(int x, int y, docstring const & str);
+       /// Determines the background color for the specified inset based on the
+       /// selection state, the background color inherited from the parent inset 
+       /// and the inset's own background color.
+       /// \param sel whether to take the selection state into account
+       ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
 
        ///
        MetricsBase base;
@@ -102,48 +109,21 @@ public:
        frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
-       /// Whether the parent is deleted (change tracking)
-       bool erased_;
+       /// The change the parent is part of (change tracking)
+       Change change_;
+       /// Whether the parent is selected as a whole
+       bool selected;
        ///
        bool full_repaint;
-       ///
+       /// Current background color
        ColorCode background_color;
 };
 
 class TextMetricsInfo {};
 
-enum ScreenUpdateStrategy {
-       NoScreenUpdate,
-       SingleParUpdate,
-       FullScreenUpdate,
-       DecorationUpdate
-};
-
-class ViewMetricsInfo
-{
-public:
-       ViewMetricsInfo()
-                       : p1(0), p2(0), y1(0), y2(0),
-                       update_strategy(FullScreenUpdate), size(0)
-               {}
-       ViewMetricsInfo(pit_type p1, pit_type p2, int y1, int y2,
-                       ScreenUpdateStrategy updatestrategy, pit_type size)
-                       : p1(p1), p2(p2), y1(y1), y2(y2),
-                       update_strategy(updatestrategy), size(size)
-               {}
-
-       pit_type p1;
-       pit_type p2;
-       int y1;
-       int y2;
-       ScreenUpdateStrategy update_strategy;
-       pit_type size;
-};
-
-
-// Generic base for temporarily changing things.
-// The original state gets restored when the Changer is destructed.
 
+/// Generic base for temporarily changing things.
+/// The original state gets restored when the Changer is destructed.
 template <class Struct, class Temp = Struct>
 class Changer {
 public: