linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2901
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2012-04-16 18:31:28 +0200
message:
  chat scrolling
modified:
  dwt/include/dwt/widgets/RichTextBox.h
  dwt/src/widgets/RichTextBox.cpp
  win32/AspectChat.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dwt/include/dwt/widgets/RichTextBox.h'
--- dwt/include/dwt/widgets/RichTextBox.h	2012-04-05 20:25:35 +0000
+++ dwt/include/dwt/widgets/RichTextBox.h	2012-04-16 16:31:28 +0000
@@ -145,8 +145,6 @@
 
 	static Dispatcher& makeDispatcher();
 
-	LRESULT onUnsuppRtf(int /*idCtrl*/, LPNMHDR pnmh, BOOL& bHandled);
-
 	int fixupLineEndings(tstring::const_iterator begin, tstring::const_iterator end,
 		tstring::difference_type ibo) const;
 

=== modified file 'dwt/src/widgets/RichTextBox.cpp'
--- dwt/src/widgets/RichTextBox.cpp	2012-04-07 19:49:12 +0000
+++ dwt/src/widgets/RichTextBox.cpp	2012-04-16 16:31:28 +0000
@@ -310,15 +310,6 @@
 	currentNeedle.clear();
 }
 
-LRESULT RichTextBox::onUnsuppRtf(int /*idCtrl*/, LPNMHDR pnmh, BOOL& bHandled) {
-#ifdef PORT_ME
-	ENLOWFIRTF *pLow = (ENLOWFIRTF *)pnmh;
-	LogManager::getInstance()->message("Unsupported RTF code: " + string(pLow->szControl));
-	bHandled = FALSE;
-#endif
-	return 0;
-}
-
 std::string RichTextBox::unicodeEscapeFormatter(const tstring_range& match) {
 	if(match.empty())
 		return std::string();

=== modified file 'win32/AspectChat.h'
--- win32/AspectChat.h	2012-03-18 15:21:56 +0000
+++ win32/AspectChat.h	2012-04-16 16:31:28 +0000
@@ -220,6 +220,9 @@
 		case VK_NEXT: // page down
 			{
 				chat->sendMessage(WM_VSCROLL, SB_PAGEDOWN);
+				// sometimes scrolls too far, so add the following:
+				if(chat->scrollIsAtEnd())
+					chat->scrollToBottom();
 				return true;
 			} break;
 		case VK_HOME: