diff --git a/components/widgets/tags.cpp b/components/widgets/tags.cpp index ddca0171c8..3fe72480b7 100644 --- a/components/widgets/tags.cpp +++ b/components/widgets/tags.cpp @@ -1,6 +1,5 @@ #include "tags.hpp" -#include #include #include @@ -11,8 +10,8 @@ namespace Gui bool replaceTag(std::string_view tag, MyGUI::UString& out) { std::string_view fontcolour = "fontcolour="; + std::string_view fontcolourhtml = "fontcolourhtml="; - std::string_view fontcolouroptional = "fontcoloursetting="; if (tag.starts_with(fontcolour)) { @@ -59,13 +58,6 @@ namespace Gui out = html.str(); return true; } - else if (tag.starts_with(fontcolouroptional)) - { - std::string_view colortag = tag.substr(fontcolouroptional.length()); - const MyGUI::Colour& customColour = Settings::get("GUI", colortag).get(); - out = customColour.print(); - return true; - } return false; } diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst index 0369e23651..08ca23c7d1 100644 --- a/docs/source/reference/modding/settings/GUI.rst +++ b/docs/source/reference/modding/settings/GUI.rst @@ -158,7 +158,7 @@ The alpha value is currently ignored. A topic response is considered unique if its Actor filter field contains the speaking actor's object ID and hasn't yet been read. color topic specific over --------------------- +------------------------- :Type: RGBA floating point :Range: 0.0 to 1.0 @@ -171,7 +171,7 @@ The alpha value is currently ignored. A dialogue topic is considered "over" if it is the active GUI element through keyboard or mouse events. color topic specific pressed --------------------- +---------------------------- :Type: RGBA floating point :Range: 0.0 to 1.0 @@ -197,7 +197,7 @@ The alpha value is currently ignored. A topic is considered "exhausted" if the response the player is about to see has already been seen. color topic exhausted over --------------------- +-------------------------- :Type: RGBA floating point :Range: 0.0 to 1.0 @@ -210,7 +210,7 @@ The alpha value is currently ignored. A dialogue topic is considered "over" if it is the active GUI element through keyboard or mouse events. color topic exhausted pressed --------------------- +----------------------------- :Type: RGBA floating point :Range: 0.0 to 1.0 @@ -220,4 +220,4 @@ This setting provides an "pressed" colour to dialogue topics that meet the color The value is composed of four floating point values representing the red, green, blue and alpha channels. The alpha value is currently ignored. -A dialogue topic is considered "pressed" if it is the active GUI element and it receives a sustained keyboard or mouse event. \ No newline at end of file +A dialogue topic is considered "pressed" if it is the active GUI element and it receives a sustained keyboard or mouse event. diff --git a/files/data/mygui/openmw_list.skin.xml b/files/data/mygui/openmw_list.skin.xml index 30ebdca35d..d17b258b80 100644 --- a/files/data/mygui/openmw_list.skin.xml +++ b/files/data/mygui/openmw_list.skin.xml @@ -129,9 +129,9 @@ - - - + + + @@ -140,9 +140,9 @@ - - - + + + diff --git a/files/settings-default.cfg b/files/settings-default.cfg index d5c6e01398..df14ef0634 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -221,16 +221,15 @@ color topic enable = false # Format R G B A or empty for no special formatting # Default to blue color topic specific = 0.45 0.5 0.8 1 -color topic specific over = 0.58 0.62 0.85 1 -color topic specific pressed = 0.29 0.36 0.75 1 - +color topic specific over = 0.6 0.6 0.85 1 +color topic specific pressed = 0.3 0.35 0.75 1 # The color of dialogue topic keywords that gives already read responses # Format R G B A or empty for no special formatting # Default to grey color topic exhausted = 0.3 0.3 0.3 1 -color topic exhausted over = 0.56 0.56 0.56 1 -color topic exhausted pressed= 0.44 0.44 0.44 1 +color topic exhausted over = 0.55 0.55 0.55 1 +color topic exhausted pressed= 0.45 0.45 0.45 1 [HUD]