Update color table in branch list

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 379b338030bf17e6eb4a6416adcee2af363a7023..aa8551ed5d663820380aa143223d55636b10c4f5 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -81,6 +81,16 @@ string const & Branch::color() const
 void Branch::setColor(string const & str)
 {
        color_ = str;
+
+       // Update the Color table
+       string color = str;
+       bool darkmode = theApp() ? theApp()->isInDarkMode() : false;
+       if (color == "none")
+               color = lcolor.getX11HexName(Color_background, darkmode);
+       else if (color.size() != 7 || color[0] != '#')
+               color = lcolor.getX11HexName(lcolor.getFromLyXName(color), darkmode);
+       // FIXME UNICODE
+       lcolor.setColor(to_utf8(branch_), color);
 }
 
 

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 93a539833bfe93088061cd218baa31d2e4d1054a..2c9821cffa1789e14574cfa9daa548020d7d221c 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -991,18 +991,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                        if (tok == "\\color") {
                                lex.eatLine();
                                string color = lex.getString();
-                               if (branch_ptr) {
+                               if (branch_ptr)
                                        branch_ptr->setColor(color);
-                                       if (branch_ptr->color() == "none")
-                                               color = lcolor.getX11HexName(Color_background);
-                               }
-                               // Update also the Color table:
-                               if (color == "none")
-                                       color = lcolor.getX11HexName(Color_background);
-                               else if (color.size() != 7 || color[0] != '#')
-                                       color = lcolor.getFromLyXName(color);
-                               // FIXME UNICODE
-                               lcolor.setColor(to_utf8(branch), color);
                        }
                }
        } else if (token == "\\index") {