diff options
author | 2018-02-01 01:13:16 +1100 | |
---|---|---|
committer | 2018-02-01 01:13:16 +1100 | |
commit | 73ce78f7b4d4c1ff8ed36f6fef61fc00a2e9135e (patch) | |
tree | 7a50841459d42fee5739652092d6629870f81e3e /docs/release/src/osd/winui/splitters.cpp | |
parent | 6488544820bbf9bc96bd2f29bbc0a8b7c0b246fa (diff) |
0.193 Release filestag193
Diffstat (limited to 'docs/release/src/osd/winui/splitters.cpp')
-rw-r--r-- | docs/release/src/osd/winui/splitters.cpp | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/docs/release/src/osd/winui/splitters.cpp b/docs/release/src/osd/winui/splitters.cpp index ce934a14731..a694c8cc5a9 100644 --- a/docs/release/src/osd/winui/splitters.cpp +++ b/docs/release/src/osd/winui/splitters.cpp @@ -4,7 +4,7 @@ /*************************************************************************** - splitters.c + splitters.cpp Splitter GUI code. - Tree, splitter, list, splitter, pict @@ -48,11 +48,11 @@ BOOL InitSplitters(void) goto error; memset(nSplitterOffset, 0, sizeof(int) * nSplitterCount); - return TRUE; + return true; error: SplittersExit(); - return FALSE; + return false; } void SplittersExit(void) @@ -74,12 +74,10 @@ void SplittersExit(void) static void CalcSplitter(HWND hWnd, LPHZSPLITTER lpSplitter) { POINT p = {0,0}; - RECT leftRect, rightRect; - int dragWidth; - ClientToScreen(hWnd, &p); GetWindowRect(lpSplitter->m_hWnd, &lpSplitter->m_dragRect); + RECT leftRect, rightRect; GetWindowRect(lpSplitter->m_hWndLeft, &leftRect); GetWindowRect(lpSplitter->m_hWndRight, &rightRect); @@ -87,7 +85,7 @@ static void CalcSplitter(HWND hWnd, LPHZSPLITTER lpSplitter) OffsetRect(&leftRect, -p.x, -p.y); OffsetRect(&rightRect, -p.x, -p.y); - dragWidth = lpSplitter->m_dragRect.right - lpSplitter->m_dragRect.left; + int dragWidth = lpSplitter->m_dragRect.right - lpSplitter->m_dragRect.left; lpSplitter->m_limitRect.left = leftRect.left + 20; lpSplitter->m_limitRect.right = rightRect.right - 20; @@ -148,9 +146,7 @@ void OnSizeSplitter(HWND hWnd) RECT rWindowRect; POINT p = {0,0}; int i; - int nSplitterCount; - - nSplitterCount = GetSplitterCount(); + int nSplitterCount = GetSplitterCount(); if (firstTime) { @@ -179,9 +175,9 @@ void OnSizeSplitter(HWND hWnd) if ((i > 0) && (nSplitterOffset[i] <= nSplitterOffset[i-1])) bMustChange = true; #ifdef MESS - if ((i==1)&&(!GetShowSoftware())) + if ((i==1)&&(!BIT(GetWindowPanes(), 2))) // sw bMustChange = false; - if ((i==2)&&(!GetShowScreenShot())) + if ((i==2)&&(!BIT(GetWindowPanes(), 3))) // images bMustChange = false; #endif if (bMustChange) @@ -234,14 +230,14 @@ static void StartTracking(HWND hWnd, UINT hitArea) { if (!bTracking && lpCurSpltr != 0 && hitArea == SPLITTER_HITITEM) { - // Ensure we have and updated cursor structure + // Ensure we have an updated cursor structure CalcSplitter(hWnd, lpCurSpltr); // Draw the first splitter shadow OnInvertTracker(hWnd, &lpCurSpltr->m_dragRect); // Capture the mouse SetCapture(hWnd); // Set tracking to TRUE - bTracking = TRUE; + bTracking = true; SetCursor(hSplitterCursor); } } @@ -255,30 +251,28 @@ static void StopTracking(HWND hWnd) // Release the mouse ReleaseCapture(); // set tracking to false - bTracking = FALSE; + bTracking = false; SetCursor(LoadCursor(0, IDC_ARROW)); // set the new splitter position nSplitterOffset[currentSplitter] = lpCurSpltr->m_dragRect.left; // Redraw the screen area ResizePickerControls(hWnd); UpdateScreenShot(); - InvalidateRect(GetMainWindow(),NULL,TRUE); + InvalidateRect(GetMainWindow(), NULL, true); } } static UINT SplitterHitTest(HWND hWnd, POINTS p) { - RECT rect; POINT pt; - int i; - pt.x = p.x; pt.y = p.y; // Check which area we hit ClientToScreen(hWnd, &pt); - for (i = 0; i < numSplitters; i++) + RECT rect; + for (int i = 0; i < numSplitters; i++) { GetWindowRect(splitter[i].m_hWnd, &rect); if (PtInRect(&rect, pt)) @@ -298,14 +292,12 @@ void OnMouseMove(HWND hWnd, UINT nFlags, POINTS p) { if (bTracking) // move the tracking image { - int nWidth; - RECT rect; POINT pt; - pt.x = (int)p.x; pt.y = (int)p.y; ClientToScreen(hWnd, &pt); + RECT rect; GetWindowRect(hWnd, &rect); if (! PtInRect(&rect, pt)) { @@ -322,7 +314,7 @@ void OnMouseMove(HWND hWnd, UINT nFlags, POINTS p) OnInvertTracker(hWnd, &lpCurSpltr->m_dragRect); // calc the new one based on p.x draw it - nWidth = lpCurSpltr->m_dragRect.right - lpCurSpltr->m_dragRect.left; + int nWidth = lpCurSpltr->m_dragRect.right - lpCurSpltr->m_dragRect.left; lpCurSpltr->m_dragRect.right = pt.x + nWidth / 2; lpCurSpltr->m_dragRect.left = pt.x - nWidth / 2; |