Changeset 15426de081a6d029f2cfca640ee4403c820873f2

Timestamp:

12/05/08 23:16:40 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

344d62118632c32a3015f295be0999136b999d68

Children:

3ae9918b3215bd9460b6b986e9d21e76cbc8c8c4

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-12-05T23:16:40Z+0100

Message:

Don't force black as default chat color, use default color instead

2008-12-05 Armin Burgmeier <armin@…>

• src/chat.cpp:
• src/logview.cpp: Don't force black as default chat color, but use the theme's default text color (Bug #411).

Files:

• ChangeLog (modified) (1 diff)
• src/chat.cpp (modified) (4 diffs)
• src/logview.cpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2008-12-05  Armin Burgmeier  <armin@0x539.de>
+
+        * src/chat.cpp:
+        * src/logview.cpp: Don't force black as default chat color, but use
+        the theme's default text color (Bug #411).
+
 2008-12-01  Armin Burgmeier  <armin@0x539.de>
 

src/chat.cpp

@@ -93 +93 @@
         set_spacing(5);
         set_sensitive(false);
+        //m_ent_chat.set_sensitive(false);
+        //m_btn_chat.set_sensitive(false);
 
 #ifdef GTKMM_GEQ_28
@@ -103 +105 @@
         );
 #endif
+
+        set_focus_child(m_log_chat);
 }
 
@@ -240 +244 @@
 
         str << name << desc;
-        m_log_chat.log(str.str(), "black", std::time(NULL) );
+        m_log_chat.log(str.str(), "", std::time(NULL) );
 }
 
@@ -329 +333 @@
 {
         // Check each line for highlighting occurence
-        Glib::ustring colour = "black";
+        Glib::ustring colour = "";
         if(&message.get_user() != &m_buffer->get_self())
                 if(is_highlighted(line, m_buffer->get_self().get_name()) )

src/logview.cpp

@@ -102 +102 @@
 {
         Glib::RefPtr<Gtk::TextBuffer> buffer = get_buffer();
-        Glib::RefPtr<Gtk::TextTag> tag = buffer->get_tag_table()->lookup(color);
+        Glib::RefPtr<Gtk::TextTag> tag;
+        if(!color.empty()) buffer->get_tag_table()->lookup(color);
 
         Glib::ustring ins_text = text;
@@ -124 +125 @@
         str << buf << ins_text.raw();
 
-        if(!tag)
+        if(!tag && !color.empty())
         {
                 tag = Gtk::TextTag::create();
@@ -132 +133 @@
         }
 
-        Gtk::TextIter end = buffer->insert_with_tag(
-                buffer->end(),
-                str.str(),
-                tag
-        );
+        Gtk::TextIter end;
+        if(tag)
+                end = buffer->insert_with_tag(buffer->end(), str.str(), tag);
+        else
+                end = buffer->insert(buffer->end(), str.str());
 
         scroll_to(m_end_mark, 0.0f);