Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix splitter resizing issue

Browse Source 
Fix resizing dockable window (e.g. search result, function list, folder as workspace) and resizing the doc splitter (other view) one after the other issue.

Fix #5516, fix #680, fix #2097, close #5554
This commit is contained in:
Rajendra Singh 2019-04-20 14:53:48 +05:30 committed by Don HO
parent fa254e579c
commit 690fd45f07
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp
View File

@ -37,17 +37,6 @@ bool Splitter::_isVerticalFixedRegistered = false;
#define SPLITTER_SIZE 8 #define SPLITTER_SIZE 8
Splitter::Splitter()
{
_rect.left = 0; // x axis
_rect.top = 0; // y axis
_rect.right = 0; // Width of the spliter.
_rect.bottom = 0; // Height of the spliter
}
void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize, double iSplitRatio, DWORD dwFlags) void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize, double iSplitRatio, DWORD dwFlags)
{ {
if (hPere == NULL) if (hPere == NULL)
@ -274,7 +263,7 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
if ((isInRightBottomZone(p))&&(wParam == MK_LBUTTON)) if ((isInRightBottomZone(p))&&(wParam == MK_LBUTTON))
{ {
gotoRightBouuom(); gotoRightBottom();
return TRUE; return TRUE;
} }
@ -282,6 +271,7 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
{ {
::SetCapture(_hSelf); ::SetCapture(_hSelf);
_isDraged = true; _isDraged = true;
_isLeftButtonDown = true;
} }
return 0; return 0;
@ -306,7 +296,7 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
return TRUE; return TRUE;
} }
if ((!_isFixed) && (wParam == MK_LBUTTON)) if ((!_isFixed) && (wParam == MK_LBUTTON) && _isLeftButtonDown)
{ {
POINT pt; RECT rt; POINT pt; RECT rt;
::GetClientRect(_hParent, &rt); ::GetClientRect(_hParent, &rt);
@ -389,9 +379,10 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
case WM_LBUTTONUP: case WM_LBUTTONUP:
{ {
if (!_isFixed) if (!_isFixed && _isLeftButtonDown)
{ {
ReleaseCapture(); ReleaseCapture();
_isLeftButtonDown = false;
} }
return 0; return 0;
} }
@ -495,7 +486,7 @@ void Splitter::gotoTopLeft()
} }
void Splitter::gotoRightBouuom() void Splitter::gotoRightBottom()
{ {
if ((_dwFlags & SV_ENABLERDBLCLK) && (!_isFixed) && (_splitPercent < 99)) if ((_dwFlags & SV_ENABLERDBLCLK) && (!_isFixed) && (_splitPercent < 99))
{ {

7
PowerEditor/src/WinControls/SplitterContainer/Splitter.h
View File

@ -64,7 +64,7 @@ enum class SplitterMode: std::uint8_t
class Splitter : public Window class Splitter : public Window
{ {
public: public:
Splitter(); Splitter() = default;
virtual ~Splitter() = default; virtual ~Splitter() = default;
virtual void destroy() override; virtual void destroy() override;
@ -80,10 +80,11 @@ public:
private: private:
RECT _rect; RECT _rect = {};
double _splitPercent = 0.; double _splitPercent = 0.;
int _splitterSize = 0; int _splitterSize = 0;
bool _isDraged = false; bool _isDraged = false;
bool _isLeftButtonDown = false;
DWORD _dwFlags = 0; DWORD _dwFlags = 0;
bool _isFixed = false; bool _isFixed = false;
static bool _isHorizontalRegistered; static bool _isHorizontalRegistered;
@ -102,7 +103,7 @@ private:
bool isVertical() const {return (_dwFlags & SV_VERTICAL) != 0;}; bool isVertical() const {return (_dwFlags & SV_VERTICAL) != 0;};
void paintArrow(HDC hdc, const RECT &rect, Arrow arrowDir); void paintArrow(HDC hdc, const RECT &rect, Arrow arrowDir);
void gotoTopLeft(); void gotoTopLeft();
void gotoRightBouuom(); void gotoRightBottom();
bool isInLeftTopZone(const POINT& p) const bool isInLeftTopZone(const POINT& p) const
{ {