for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i))
{
REBAR_BAND *lpBand = REBAR_GetBand(infoPtr, i);
-
- lpBand = REBAR_GetBand(infoPtr, i);
if (lpBand->rcBand.left != xPos || lpBand->rcBand.right != xPos + lpBand->cxEffective) {
lpBand->fDraw |= NTF_INVALIDATE;
TRACE("Setting rect %d to %d,%d\n", i, xPos, xPos + lpBand->cxEffective);
return cxShrink;
}
+/* Tries to move a band to a given offset within a row. */
+static int REBAR_MoveBandToRowOffset(REBAR_INFO *infoPtr, INT iBand, INT iFirstBand,
+ INT iLastBand, INT xOff, BOOL reorder)
+{
+ REBAR_BAND *insertBand = REBAR_GetBand(infoPtr, iBand);
+ int xPos = 0, i;
+ const BOOL setBreak = REBAR_GetBand(infoPtr, iFirstBand)->fStyle & RBBS_BREAK;
+
+ /* Find the band's new position */
+ if(reorder)
+ {
+ /* Used during an LR band reorder drag */
+ for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i))
+ {
+ if(xPos > xOff)
+ break;
+ xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH;
+ }
+ }
+ else
+ {
+ /* Used during a UD band insertion drag */
+ for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i))
+ {
+ const REBAR_BAND *band = REBAR_GetBand(infoPtr, i);
+ if(xPos + band->cxMinBand / 2 > xOff)
+ break;
+ xPos += band->cxEffective + SEP_WIDTH;
+ }
+ }
+
+ /* Move the band to its new position */
+ DPA_DeletePtr(infoPtr->bands, iBand);
+ if(i > iBand)
+ i--;
+ DPA_InsertPtr(infoPtr->bands, i, insertBand);
+
+ /* Ensure only the last band has the RBBS_BREAK flag set */
+ insertBand->fStyle &= ~RBBS_BREAK;
+ if(setBreak)
+ REBAR_GetBand(infoPtr, iFirstBand)->fStyle |= RBBS_BREAK;
+
+ /* Return the currently grabbed band */
+ if(infoPtr->iGrabbedBand == iBand)
+ {
+ infoPtr->iGrabbedBand = i;
+ return i;
+ }
+ else return -1;
+}
+
/* Set the heights of the visible bands in [iBeginBand; iEndBand) to the max height. iBeginBand must be visible */
static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT iEndBand, INT yStart)
{
/* Gripper drag within a row. It will not implement "out- */
/* of-row" drags. (They are detected and handled in */
/* REBAR_MouseMove.) */
- /* **** FIXME Switching order of bands in a row not **** */
- /* **** yet implemented. **** */
{
REBAR_BAND *hitBand;
INT iHitBand, iRowBegin, iRowEnd;
- INT movement, xBand;
-
- /* on first significant mouse movement, issue notify */
- if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) {
- if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) {
- /* Notify returned TRUE - abort drag */
- infoPtr->dragStart.x = 0;
- infoPtr->dragStart.y = 0;
- infoPtr->dragNow = infoPtr->dragStart;
- infoPtr->iGrabbedBand = -1;
- ReleaseCapture ();
- return ;
- }
- infoPtr->fStatus |= BEGIN_DRAG_ISSUED;
- }
+ INT movement, xBand, cxLeft = 0;
+ BOOL shrunkBands = FALSE;
iHitBand = infoPtr->iGrabbedBand;
iRowBegin = get_row_begin_for_band(infoPtr, iHitBand);
movement = (infoPtr->dwStyle&CCS_VERT ? ptsmove->y : ptsmove->x)
- (xBand + REBAR_PRE_GRIPPER - infoPtr->ihitoffset);
- if (movement < 0) {
- INT cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE);
- hitBand->cxEffective += -movement - cxLeft;
- hitBand->cx = hitBand->cxEffective;
- } else if (movement > 0) {
- INT prev;
-
- if ((prev = prev_visible(infoPtr, iHitBand)) >= 0) {
- INT cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE);
- REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand));
- lpPrev->cxEffective += movement - cxLeft;
- lpPrev->cx = lpPrev->cxEffective;
+ /* Dragging the first band in a row cannot cause shrinking */
+ if(iHitBand != iRowBegin)
+ {
+ if (movement < 0) {
+ cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE);
+
+ if(cxLeft < -movement)
+ {
+ hitBand->cxEffective += -movement - cxLeft;
+ hitBand->cx = hitBand->cxEffective;
+ shrunkBands = TRUE;
+ }
+
+ } else if (movement > 0) {
+
+ cxLeft = movement;
+ if (prev_visible(infoPtr, iHitBand) >= 0)
+ cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE);
+
+ if(cxLeft < movement)
+ {
+ REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand));
+ lpPrev->cxEffective += movement - cxLeft;
+ lpPrev->cx = hitBand->cxEffective;
+ shrunkBands = TRUE;
+ }
+
}
}
+ if(!shrunkBands)
+ {
+ /* It was not possible to move the band by shrinking bands.
+ * Try relocating the band instead. */
+ REBAR_MoveBandToRowOffset(infoPtr, iHitBand, iRowBegin,
+ iRowEnd, xBand + movement, TRUE);
+ }
+
REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd);
if (infoPtr->dwStyle & CCS_VERT)
REBAR_CalcVertBand(infoPtr, 0, infoPtr->uNumBands);
REBAR_MoveChildWindows(infoPtr, iRowBegin, iRowEnd);
}
+static void
+REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove)
+{
+ INT yOff = (infoPtr->dwStyle & CCS_VERT) ? ptsmove->x : ptsmove->y;
+ INT iHitBand, iRowBegin, iNextRowBegin;
+ REBAR_BAND *hitBand, *rowBeginBand;
+
+ if(infoPtr->uNumBands <= 0)
+ ERR("There are no bands in this rebar");
+
+ /* Up/down dragging can only occur when there is more than one
+ * band in the rebar */
+ if(infoPtr->uNumBands <= 1)
+ return;
+
+ iHitBand = infoPtr->iGrabbedBand;
+ hitBand = REBAR_GetBand(infoPtr, iHitBand);
+
+ /* If we're taking a band that has the RBBS_BREAK style set, this
+ * style needs to be reapplied to the band that is going to become
+ * the new start of the row. */
+ if((hitBand->fStyle & RBBS_BREAK) &&
+ (iHitBand < infoPtr->uNumBands - 1))
+ REBAR_GetBand(infoPtr, iHitBand + 1)->fStyle |= RBBS_BREAK;
+
+ if(yOff < 0)
+ {
+ /* Place the band above the current top row */
+ DPA_DeletePtr(infoPtr->bands, iHitBand);
+ hitBand->fStyle &= RBBS_BREAK;
+ REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK;
+ infoPtr->iGrabbedBand = DPA_InsertPtr(
+ infoPtr->bands, 0, hitBand);
+ }
+ else if(yOff > REBAR_GetBand(infoPtr, infoPtr->uNumBands - 1)->rcBand.bottom)
+ {
+ /* Place the band below the current bottom row */
+ DPA_DeletePtr(infoPtr->bands, iHitBand);
+ hitBand->fStyle |= RBBS_BREAK;
+ infoPtr->iGrabbedBand = DPA_InsertPtr(
+ infoPtr->bands, infoPtr->uNumBands - 1, hitBand);
+ }
+ else
+ {
+ /* Place the band in the prexisting row the mouse is hovering over */
+ iRowBegin = first_visible(infoPtr);
+ while(iRowBegin < infoPtr->uNumBands)
+ {
+ iNextRowBegin = get_row_end_for_band(infoPtr, iRowBegin);
+ rowBeginBand = REBAR_GetBand(infoPtr, iRowBegin);
+ if(rowBeginBand->rcBand.bottom > yOff)
+ {
+ REBAR_MoveBandToRowOffset(
+ infoPtr, iHitBand, iRowBegin, iNextRowBegin,
+ ((infoPtr->dwStyle & CCS_VERT) ? ptsmove->y : ptsmove->x)
+ - REBAR_PRE_GRIPPER - infoPtr->ihitoffset, FALSE);
+ break;
+ }
+
+ iRowBegin = iNextRowBegin;
+ }
+ }
+
+ REBAR_Layout(infoPtr);
+}
/* << REBAR_BeginDrag >> */
static LRESULT
-REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, LPREBARBANDINFOW lprbbi, BOOL bUnicode)
+REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, const REBARBANDINFOW *lprbbi, BOOL bUnicode)
{
REBAR_BAND *lpBand;
}
static LRESULT
-REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, LPREBARBANDINFOW lprbbi, BOOL bUnicode)
+REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, const REBARBANDINFOW *lprbbi, BOOL bUnicode)
{
REBAR_BAND *lpBand;
UINT uChanged;
static LRESULT
-REBAR_SetBarInfo (REBAR_INFO *infoPtr, LPREBARINFO lpInfo)
+REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo)
{
REBAR_BAND *lpBand;
UINT i;
/* if we are currently dragging a band */
if (infoPtr->iGrabbedBand >= 0)
{
- REBAR_BAND *band1 = NULL, *band2;
+ REBAR_BAND *band;
int yPtMove = (infoPtr->dwStyle & CCS_VERT ? ptMove.x : ptMove.y);
if (GetCapture() != infoPtr->hwndSelf)
ERR("We are dragging but haven't got capture?!?\n");
- if (infoPtr->iGrabbedBand > 0)
- band1 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand - 1);
- band2 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand);
+ band = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand);
/* if mouse did not move much, exit */
if ((abs(ptMove.x - infoPtr->dragNow.x) <= mindragx) &&
(abs(ptMove.y - infoPtr->dragNow.y) <= mindragy)) return 0;
+ /* on first significant mouse movement, issue notify */
+ if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) {
+ if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) {
+ /* Notify returned TRUE - abort drag */
+ infoPtr->dragStart.x = 0;
+ infoPtr->dragStart.y = 0;
+ infoPtr->dragNow = infoPtr->dragStart;
+ infoPtr->iGrabbedBand = -1;
+ ReleaseCapture ();
+ return 0;
+ }
+ infoPtr->fStatus |= BEGIN_DRAG_ISSUED;
+ }
+
/* Test for valid drag case - must not be first band in row */
- if ((yPtMove < band2->rcBand.top) ||
- (yPtMove > band2->rcBand.bottom) ||
- ((infoPtr->iGrabbedBand > 0) && (band1->iRow != band2->iRow))) {
- FIXME("Cannot drag to other rows yet!!\n");
+ if ((yPtMove < band->rcBand.top) ||
+ (yPtMove > band->rcBand.bottom)) {
+ REBAR_HandleUDDrag (infoPtr, &ptMove);
}
else {
REBAR_HandleLRDrag (infoPtr, &ptMove);
static LRESULT
-REBAR_NCCreate (HWND hwnd, LPCREATESTRUCTW cs)
+REBAR_NCCreate (HWND hwnd, const CREATESTRUCTW *cs)
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
RECT wnrc1, clrc1;
projects / reactos.git / blobdiff