3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-08-06 10:09:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

"dir" was used by mistake instead of "filename"

Browse source
This commit is contained in:
Nick Bolton 2014-02-07 15:54:01 +00:00
parent 8a8ae6c0b1
commit 3ee4f55a61
16 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/lib/platform/CMSWindowsScreen.cpp
View file

@ -362,8 +362,8 @@ CMSWindowsScreen::leave()
forceShowCursor();
if (getDraggingStarted()) {
CString& draggingDir = getDraggingFileDir();
size_t size = draggingDir.size();
CString& draggingFilename = getDraggingFilename();
size_t size = draggingFilename.size();
if (!m_isPrimary) {
// TODO: fake these keys properly
@ -372,14 +372,14 @@ CMSWindowsScreen::leave()
fakeMouseButton(kButtonLeft, false);
if (draggingDir.empty() == false) {
if (draggingFilename.empty() == false) {
CClientApp& app = CClientApp::instance();
CClient* client = app.getClientPtr();
UInt32 fileCount = 1;
LOG((CLOG_DEBUG "send dragging info to server: %s", draggingDir.c_str()));
client->draggingInfoSending(fileCount, draggingDir, size);
LOG((CLOG_DEBUG "send dragging info to server: %s", draggingFilename.c_str()));
client->draggingInfoSending(fileCount, draggingFilename, size);
LOG((CLOG_DEBUG "send dragging file to server"));
client->sendFileToServer(draggingDir.c_str());
client->sendFileToServer(draggingFilename.c_str());
}
}
@ -1332,8 +1332,8 @@ CMSWindowsScreen::onMouseButton(WPARAM wParam, LPARAM lParam)
if (pressed) {
m_buttons[button] = true;
if (button == kButtonLeft) {
m_draggingFileDir.clear();
LOG((CLOG_DEBUG2 "dragging file directory is cleared"));
m_draggingFilename.clear();
LOG((CLOG_DEBUG2 "dragging filename is cleared"));
}
}
else {
@ -1896,17 +1896,17 @@ CMSWindowsScreen::fakeDraggingFiles(CString str)
}
CString&
CMSWindowsScreen::getDraggingFileDir()
CMSWindowsScreen::getDraggingFilename()
{
if (m_draggingStarted) {
// temporarily log out dragging file directory
// temporarily log out dragging filename
char dir[MAX_PATH];
m_hookLibraryLoader.m_getDraggingFileDir(dir);
m_draggingFileDir.clear();
m_draggingFileDir.append(dir);
m_hookLibraryLoader.m_getDraggingFilename(dir);
m_draggingFilename.clear();
m_draggingFilename.append(dir);
}
return m_draggingFileDir;
return m_draggingFilename;
}
const CString&