diff options
author | David Athay <ko2fan@gmail.com> | 2008-05-09 15:23:32 +0000 |
---|---|---|
committer | David Athay <ko2fan@gmail.com> | 2008-05-09 15:23:32 +0000 |
commit | b57ab24cdaa596bf91604279c97fbfdeff1dc93b (patch) | |
tree | af0c7bb16c60cc9055b45b6929483c05de8facac /src/gui/chat.cpp | |
parent | 96c635e12b1834493abfbe4685cfc1d6a3eaddc4 (diff) | |
download | mana-b57ab24cdaa596bf91604279c97fbfdeff1dc93b.tar.gz mana-b57ab24cdaa596bf91604279c97fbfdeff1dc93b.tar.bz2 mana-b57ab24cdaa596bf91604279c97fbfdeff1dc93b.tar.xz mana-b57ab24cdaa596bf91604279c97fbfdeff1dc93b.zip |
Changed the tabbedarea to be transparant as before. Changed setup
window and skills dialog to use the new tabbed area. Removed tabbed
container as it is no longer used. Fixed a crash with the chat window.
Diffstat (limited to 'src/gui/chat.cpp')
-rw-r--r-- | src/gui/chat.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 3d63491c..fec2394b 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -152,7 +152,7 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName) break; case BY_PLAYER: tmp.nick += ": "; - lineColor = "##5"; // Equiv. to BrowserBox::YELLOW + lineColor = "##3"; // Equiv. to BrowserBox::BLUE break; case BY_OTHER: tmp.nick += ": "; @@ -506,10 +506,17 @@ ChatWindow::createNewChannelTab(const std::string &channelName) BrowserBox *textOutput = new BrowserBox(BrowserBox::AUTO_WRAP); textOutput->setOpaque(false); textOutput->disableLinksAndUserColors(); + textOutput->setMaxRow((int) config.getValue("ChatLogLength", 0)); ScrollArea *scrollArea = new ScrollArea(textOutput); scrollArea->setPosition(scrollArea->getFrameSize(), scrollArea->getFrameSize()); scrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS); scrollArea->setOpaque(false); + scrollArea->setWidth(getChildrenArea().width - 2 * scrollArea->getFrameSize()); + scrollArea->setHeight(getChildrenArea().height - 2 * scrollArea->getFrameSize() - + mChatInput->getHeight() - 5); + scrollArea->logic(); + textOutput->setWidth(scrollArea->getChildrenArea().width); + textOutput->setHeight(scrollArea->getChildrenArea().height); // Add channel to the tabbed area mChatTabs->addTab(channelName, scrollArea); |