tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-24 22:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change splitter percent value to double (fixes issue #405)

Browse Source 
Prevents round-off error when resizing splitter
This commit is contained in:
Adrian Avramescu 2015-07-27 12:56:37 -07:00
parent 11ad9f699a
commit 550246ffc9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ Splitter::Splitter() : Window()
void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize, void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize,
int iSplitRatio, DWORD dwFlags) double iSplitRatio, DWORD dwFlags)
{ {
if (hPere == NULL) if (hPere == NULL)
{ {
@ -100,7 +100,7 @@ void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize,
if (_dwFlags & SV_HORIZONTAL) //Horizontal spliter if (_dwFlags & SV_HORIZONTAL) //Horizontal spliter
{ {
_rect.top = ((_rect.bottom * _splitPercent)/100); _rect.top = (LONG)((_rect.bottom * _splitPercent)/100);
// y axis determined by the split% of the parent windows height // y axis determined by the split% of the parent windows height
_rect.left = 0; _rect.left = 0;
@ -115,7 +115,7 @@ void Splitter::init( HINSTANCE hInst, HWND hPere, int splitterSize,
{ {
// y axis is 0 always // y axis is 0 always
_rect.left = ((_rect.right * _splitPercent)/100); _rect.left = (LONG)((_rect.right * _splitPercent)/100);
// x axis determined by split% of the parent windows width. // x axis determined by split% of the parent windows width.
_rect.right = _spiltterSize; _rect.right = _spiltterSize;
@ -340,7 +340,7 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
if (pt.y <= (rt.bottom - 5)) if (pt.y <= (rt.bottom - 5))
{ {
_rect.top = pt.y; _rect.top = pt.y;
_splitPercent = ((pt.y * 100 / rt.bottom*100) / 100); _splitPercent = ((pt.y * 100 / (double)rt.bottom*100) / 100);
} }
else else
{ {
@ -361,7 +361,7 @@ LRESULT CALLBACK Splitter::spliterWndProc(UINT uMsg, WPARAM wParam, LPARAM lPara
if (pt.x <= (rt.right - 5)) if (pt.x <= (rt.right - 5))
{ {
_rect.left = pt.x; _rect.left = pt.x;
_splitPercent = ((pt.x*100/rt.right*100)/100); _splitPercent = ((pt.x*100 / (double)rt.right*100) / 100);
} }
else else
{ {
@ -425,7 +425,7 @@ void Splitter::resizeSpliter(RECT *pRect)
//if resizeing should be done proportionately. //if resizeing should be done proportionately.
if (_dwFlags & SV_RESIZEWTHPERCNT) if (_dwFlags & SV_RESIZEWTHPERCNT)
_rect.top = ((rect.bottom * _splitPercent)/100); _rect.top = (LONG)((rect.bottom * _splitPercent)/100);
else // soit la fenetre en haut soit la fenetre en bas qui est fixee else // soit la fenetre en haut soit la fenetre en bas qui est fixee
_rect.top = getSplitterFixPosY(); _rect.top = getSplitterFixPosY();
} }
@ -438,7 +438,7 @@ void Splitter::resizeSpliter(RECT *pRect)
//if resizeing should be done proportionately. //if resizeing should be done proportionately.
if (_dwFlags & SV_RESIZEWTHPERCNT) if (_dwFlags & SV_RESIZEWTHPERCNT)
{ {
_rect.left = ((rect.right * _splitPercent)/100); _rect.left = (LONG)((rect.right * _splitPercent)/100);
} }
else // soit la fenetre gauche soit la fenetre droit qui est fixee else // soit la fenetre gauche soit la fenetre droit qui est fixee
_rect.left = getSplitterFixPosX(); _rect.left = getSplitterFixPosX();

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

@ -74,7 +74,7 @@ public:
}; };
void resizeSpliter(RECT *pRect = NULL); void resizeSpliter(RECT *pRect = NULL);
void init(HINSTANCE hInst, HWND hPere, int splitterSize, void init(HINSTANCE hInst, HWND hPere, int splitterSize,
int iSplitRatio, DWORD dwFlags); double iSplitRatio, DWORD dwFlags);
void rotate(); void rotate();
int getPhisicalSize() const { int getPhisicalSize() const {
return _spiltterSize; return _spiltterSize;
@ -82,7 +82,7 @@ public:
private: private:
RECT _rect; RECT _rect;
int _splitPercent; double _splitPercent;
int _spiltterSize; int _spiltterSize;
bool _isDraged; bool _isDraged;
DWORD _dwFlags; DWORD _dwFlags;