* Add support for UP arrow when inside a channel, for editing messages.

Issue mentioned: #222

Author: iProgramMC

src/resource.h

@@ -528,6 +528,7 @@
 #define ID_DUMMYPOPUP_OPENPROXYLINK     1107
 #define ID_DUMMYPOPUP_COPYPROXYLINK1108 1108
 #define ID_DUMMYPOPUP_OPENPROXYLINK1109 1109
+#define IDA_EDIT_LAST_MESSAGE           1110
 #define IDR_MAIN_ACCELS                 1201
 #define IDA_SEARCH                      1301
 #define IDA_QUICKSWITCHER               1302
@@ -551,7 +552,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        106
-#define _APS_NEXT_COMMAND_VALUE         1110
+#define _APS_NEXT_COMMAND_VALUE         1112
 #define _APS_NEXT_CONTROL_VALUE         918
 #define _APS_NEXT_SYMED_VALUE           40000
 #endif

src/resource.rc

@@ -1444,12 +1444,6 @@ IDC_CLICKER             CURSOR                  "../res/cursors/cur_clicker.cur"
 
 IDR_MAIN_ACCELS ACCELERATORS
 BEGIN
-    "V",            IDA_PASTE,              VIRTKEY, CONTROL, NOINVERT
-    "K",            IDA_QUICKSWITCHER,      VIRTKEY, CONTROL, NOINVERT
-    "F",            IDA_SEARCH,             VIRTKEY, CONTROL, NOINVERT
-    VK_PRIOR,       IDA_PAGE_UP,            VIRTKEY, NOINVERT
-    VK_NEXT,        IDA_PAGE_DOWN,          VIRTKEY, NOINVERT
-    "A",            IDA_SELECT_ALL,         VIRTKEY, CONTROL, NOINVERT
     "1",            IDA_GUILD_0,            VIRTKEY, CONTROL, NOINVERT
     "2",            IDA_GUILD_1,            VIRTKEY, CONTROL, NOINVERT
     "3",            IDA_GUILD_2,            VIRTKEY, CONTROL, NOINVERT
@@ -1460,6 +1454,13 @@ BEGIN
     "8",            IDA_GUILD_7,            VIRTKEY, CONTROL, NOINVERT
     "9",            IDA_GUILD_8,            VIRTKEY, CONTROL, NOINVERT
     "0",            IDA_GUILD_9,            VIRTKEY, CONTROL, NOINVERT
+    VK_NEXT,        IDA_PAGE_DOWN,          VIRTKEY, NOINVERT
+    VK_PRIOR,       IDA_PAGE_UP,            VIRTKEY, NOINVERT
+    "V",            IDA_PASTE,              VIRTKEY, CONTROL, NOINVERT
+    "K",            IDA_QUICKSWITCHER,      VIRTKEY, CONTROL, NOINVERT
+    "F",            IDA_SEARCH,             VIRTKEY, CONTROL, NOINVERT
+    "A",            IDA_SELECT_ALL,         VIRTKEY, CONTROL, NOINVERT
+    VK_UP,          IDA_EDIT_LAST_MESSAGE,  VIRTKEY, NOINVERT
 END
 
 

src/windows/Main.cpp

@@ -696,6 +696,11 @@ LRESULT HandleCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			g_pMessageEditor->SelectAll();
 			break;
 		}
+		case IDA_EDIT_LAST_MESSAGE:
+		{
+			g_pMessageList->EditLastMessage();
+			break;
+		}
 		case IDA_GUILD_0:
 		case IDA_GUILD_1:
 		case IDA_GUILD_2:

src/windows/MessageList.cpp

@@ -3059,6 +3059,47 @@ void MessageList::PaintBackground(HDC hdc, RECT& paintRect, RECT& rcClient)
 	}
 }
 
+bool MessageList::IsMessageVisible(Snowflake sf)
+{
+	// TODO: deduplicate this.  Part of this is also in Paint()
+	RECT rect = {};
+	GetClientRect(m_hwnd, &rect);
+	int windowHeight = rect.bottom - rect.top;
+	int ScrollHeight = 0;
+	SCROLLINFO si;
+	si.cbSize = sizeof(si);
+	si.fMask = SIF_POS | SIF_RANGE;
+	ri::GetScrollInfo(m_hwnd, SB_VERT, &si);
+	ScrollHeight = si.nPos;
+
+	RECT msgRect = rect;
+	msgRect.top -= ScrollHeight;
+
+	if (m_total_height < windowHeight && !m_bIsTopDown) {
+		msgRect.top += windowHeight - m_total_height;
+	}
+
+	msgRect.bottom = msgRect.top;
+
+	for (std::list<MessageItem>::iterator iter = m_messages.begin();
+		iter != m_messages.end();
+		++iter)
+	{
+		bool isActionMessage = IsActionMessage(iter->m_msg->m_type);
+		bool needUpdate = false;
+
+		msgRect.bottom = msgRect.top + iter->m_height;
+		iter->m_rect = msgRect;
+
+		bool bDraw = msgRect.top <= rect.bottom && msgRect.bottom > rect.top;
+
+		if (iter->m_msg->m_snowflake == sf)
+			return bDraw;
+	}
+
+	return false;
+}
+
 void MessageList::Paint(HDC hdc, RECT& paintRect)
 {
 	RECT rect = {};
@@ -4650,6 +4691,31 @@ void MessageList::OnPageDown()
 	SendMessage(m_hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
 }
 
+void MessageList::EditLastMessage()
+{
+	Profile* profile = GetDiscordInstance()->GetProfile();
+	Snowflake sf = 0;
+
+	for (auto iter = m_messages.rbegin(); iter != m_messages.rend(); ++iter)
+	{
+		if (iter->m_msg->m_author_snowflake != profile->m_snowflake)
+			continue;
+
+		sf = iter->m_msg->m_snowflake;
+		break;
+	}
+
+	if (!sf) {
+		DbgPrintW("Your last message isn't loaded!");
+		return;
+	}
+
+	if (!IsMessageVisible(sf))
+		SendToMessage(sf, false, false);
+
+	SendMessage(g_Hwnd, WM_STARTEDITING, 0, (LPARAM) &sf);
+}
+
 bool MessageList::ShouldStartNewChain(Snowflake prevAuthor, time_t prevTime, int prevPlaceInChain, MessageType::eType prevType, const std::string& prevAuthorName, const std::string& prevAuthorAvatar, const MessageItem& item, bool ifChainTooLongToo)
 {
 	if (m_bManagedByOwner)

src/windows/MessageList.hpp

@@ -524,6 +524,7 @@ class MessageList
 	bool ShouldBeDateGap(time_t oldTime, time_t newTime);
 	void OnPageUp();
 	void OnPageDown();
+	void EditLastMessage();
 
 	// TODO: Wouldn't it be more sane to have a pointer to the last message item, or something?
 	bool ShouldStartNewChain(Snowflake prevAuthor, time_t prevTime, int prevPlaceInChain, MessageType::eType prevType, const std::string& prevAuthorName, const std::string& prevAuthorAvatar, const MessageItem& item, bool ifChainTooLongToo);
@@ -568,6 +569,8 @@ class MessageList
 	void HandleRightClickMenuCommandMessage(int command, MessageItem* pMsg);
 	void HandleRightClickMenuCommandInteractable(int command, MessageItem* pMsg);
 
+	bool IsMessageVisible(Snowflake sf);
+
 	HMENU GetMenuForMessage(MessageItem* pRCMsg);
 	HMENU GetMenuForInteractable(MessageItem* pRCMsg, size_t index);
 	HMENU GetMenuForAttachment(MessageItem* pRCMsg, size_t index);