Bläddra i källkod

Merge remote-tracking branch 'arnislielturks/console-update'

Lasse Öörni 9 år sedan
förälder
incheckning
c548d8ed24
2 ändrade filer med 23 tillägg och 3 borttagningar
  1. 13 2
      Source/Urho3D/Engine/Console.cpp
  2. 10 1
      bin/Data/UI/DefaultStyle.xml

+ 13 - 2
Source/Urho3D/Engine/Console.cpp

@@ -48,6 +48,15 @@ namespace Urho3D
 static const int DEFAULT_CONSOLE_ROWS = 16;
 static const int DEFAULT_HISTORY_SIZE = 16;
 
+const char* logStyles[] =
+{
+    "ConsoleDebugText",
+    "ConsoleInfoText",
+    "ConsoleWarningText",
+    "ConsoleErrorText",
+    "ConsoleText"
+};
+
 Console::Console(Context* context) :
     Object(context),
     autoVisibleOnError_(false),
@@ -563,8 +572,10 @@ void Console::HandlePostUpdate(StringHash eventType, VariantMap& eventData)
         rowContainer_->RemoveItem((unsigned)0);
         text = new Text(context_);
         text->SetText(pendingRows_[i].second_);
-        // Make error message highlight
-        text->SetStyle(pendingRows_[i].first_ == LOG_ERROR ? "ConsoleHighlightedText" : "ConsoleText");
+        
+        //Highlight console messages based on their type
+        text->SetStyle(logStyles[pendingRows_[i].first_]);
+
         rowContainer_->AddItem(text);
     }
 

+ 10 - 1
bin/Data/UI/DefaultStyle.xml

@@ -252,9 +252,18 @@
         <attribute name="Hover Color" value="0.3 0.4 0.7 1" />
         <attribute name="Selection Color" value="0.2 0.225 0.35 1" />
     </element>
-    <element type="ConsoleHighlightedText" style="ConsoleText" auto="false">
+    <element type="ConsoleErrorText" style="ConsoleText" auto="false">
         <attribute name="Color" value="1 0 0 1" />
     </element>
+    <element type="ConsoleDebugText" style="ConsoleText" auto="false">
+        <attribute name="Color" value="1 0.6 0 1" />
+    </element>
+    <element type="ConsoleInfoText" style="ConsoleText" auto="false">
+        <attribute name="Color" value="0.85 0.85 0.85" />
+    </element>
+    <element type="ConsoleWarningText" style="ConsoleText" auto="false">
+        <attribute name="Color" value="1 1 0 1" />
+    </element>
     <element type="ConsoleLineEdit" style="LineEdit" auto="false">
         <attribute name="Min Size" value="0 17" />
         <attribute name="Max Size" value="2147483647 17" />