LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / BranchList.C

diff --git a/src/BranchList.C b/src/BranchList.C
index dc09595841052b5a563f02b0df1b9842747e960b..90aabdc0350638b90d47aa66871d685af470f37a 100644 (file)
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -11,24 +11,22 @@
 #include <config.h>
 
 #include "BranchList.h"
+#include "LColor.h"
 
-using std::string;
+#include "frontends/Application.h"
 
-namespace {
+#include <algorithm>
+
+
+namespace lyx {
+
+using std::string;
 
-class BranchNamesEqual : public std::unary_function<Branch, bool> {
-public:
-       BranchNamesEqual(string const & name)
-               : name_(name) {}
-       bool operator()(Branch const & branch) const
-       {
-               return branch.getBranch() == name_;
-       }
-private:
-       string name_;
-};
 
-} // namespace anon
+Branch::Branch()
+{
+       theApp->getRgbColor(LColor::background, color_);
+}
 
 
 string const & Branch::getBranch() const
@@ -58,18 +56,28 @@ bool Branch::setSelected(bool b)
 }
 
 
-string const & Branch::getColor() const
+RGBColor const & Branch::getColor() const
 {
        return color_;
 }
 
 
-void Branch::setColor(string const & c)
+void Branch::setColor(RGBColor const & c)
 {
        color_ = c;
 }
 
 
+void Branch::setColor(string const & c)
+{
+       if (c.size() == 7 && c[0] == '#')
+               color_ = RGBColor(c);
+       else
+               // no color set or invalid color - use normal background
+               theApp->getRgbColor(LColor::background, color_);
+}
+
+
 Branch * BranchList::find(std::string const & name)
 {
        List::iterator it =
@@ -106,7 +114,6 @@ bool BranchList::add(string const & s)
                        Branch br;
                        br.setBranch(name);
                        br.setSelected(false);
-                       br.setColor("none");
                        list.push_back(br);
                }
                if (j == string::npos)
@@ -119,7 +126,10 @@ bool BranchList::add(string const & s)
 
 bool BranchList::remove(string const & s)
 {
-       List::size_type const size = list.size();
+       size_t const size = list.size();
        list.remove_if(BranchNamesEqual(s));
        return size != list.size();
 }
+
+
+} // namespace lyx