Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions PythonScript/src/NotepadPlusWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1079,10 +1079,23 @@ void NotepadPlusWrapper::disableAutoUpdate()
callNotepad(NPPM_DISABLEAUTOUPDATE, 0, 0);
}

<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ClaudiaFrank Merge markers are still contained -> build issue

void NotepadPlusWrapper::flashWindow(UINT count, DWORD timeout)
{
FLASHWINFO flashinfo;
flashinfo.cbSize = sizeof(flashinfo);
flashinfo.hwnd = m_nppHandle;
flashinfo.dwFlags = FLASHW_ALL;
flashinfo.dwTimeout = timeout;
flashinfo.uCount = count;

FlashWindowEx(&flashinfo);
=======
bool NotepadPlusWrapper::isSingleView()
{
HWND splitter_hwnd = FindWindowEx(m_nppHandle, NULL, L"splitterContainer", NULL);
return !IsWindowVisible(splitter_hwnd);
>>>>>>> 2b89775f18ee81056f9cc8aca471a05ae920ca8f
}


Expand Down
4 changes: 4 additions & 0 deletions PythonScript/src/NotepadPlusWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,11 @@ class NotepadPlusWrapper

boost::python::str getPluginVersion();

<<<<<<< HEAD
void flashWindow(UINT count, DWORD timeout);
=======
bool isSingleView();
>>>>>>> 2b89775f18ee81056f9cc8aca471a05ae920ca8f

protected:
LRESULT callNotepad(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)
Expand Down
4 changes: 4 additions & 0 deletions PythonScript/src/NotepadPython.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ void export_notepad()
.def("getEnableThemeTextureFunc", &NotepadPlusWrapper::getEnableThemeTextureFunc, "TODO")
.def("triggerTabbarContextMenu", &NotepadPlusWrapper::triggerTabbarContextMenu, boost::python::args("view, index2Activate"), "Activates the context menu for provided view and tab index")
.def("disableAutoUpdate", &NotepadPlusWrapper::disableAutoUpdate, "Disables notepad++ auto update functionality")
<<<<<<< HEAD
.def("flashWindow", &NotepadPlusWrapper::flashWindow, boost::python::args("count", "timeout"), "Flashes notepad++ for the given count and timeout");
=======
.def("isSingleView", &NotepadPlusWrapper::isSingleView, "True if only one view is used, False otherwise");
>>>>>>> 2b89775f18ee81056f9cc8aca471a05ae920ca8f

boost::python::enum_<LangType>("LANGTYPE")
.value("TXT", L_TEXT)
Expand Down