This commit is contained in:
Erik Faye-Lund 2008-02-11 08:12:27 +00:00
parent 359f5a2eed
commit f8c1ec9d6a
2 changed files with 16 additions and 11 deletions

View File

@ -32,15 +32,15 @@ TrackView::TrackView()
this->hwnd = NULL;
bgBaseBrush = GetSysColorBrush(COLOR_WINDOW); // CreateSolidBrush(RGB(0xff, 0xff, 0xff));
bgBaseBrush = GetSysColorBrush(COLOR_WINDOW);
bgDarkBrush = CreateSolidBrush(darken(GetSysColor(COLOR_WINDOW), 0.9f));
// selectBaseBrush = CreateSolidBrush(RGB(0xff, 0xdd, 0xff));
// selectDarkBrush = CreateSolidBrush(RGB(0xdd, 0xbb, 0xdd));
selectBaseBrush = GetSysColorBrush(COLOR_HIGHLIGHT);
selectDarkBrush = CreateSolidBrush(darken(GetSysColor(COLOR_HIGHLIGHT), 0.9f));
rowPen = CreatePen(PS_SOLID, 1, darken(GetSysColor(COLOR_WINDOW), 0.7f));
rowSelectPen = CreatePen(PS_SOLID, 1, darken(GetSysColor(COLOR_HIGHLIGHT), 0.7f));
editBrush = CreateSolidBrush(RGB(255, 255, 0)); // yellow
clipboardFormat = RegisterClipboardFormat(_T("syncdata"));
@ -54,6 +54,8 @@ TrackView::~TrackView()
DeleteObject(selectBaseBrush);
DeleteObject(selectDarkBrush);
DeleteObject(editBrush);
DeleteObject(rowPen);
DeleteObject(rowSelectPen);
}
int TrackView::getScreenY(int row)
@ -238,11 +240,13 @@ void TrackView::paintTracks(HDC hdc, RECT rcTracks)
RECT fillRect = patternDataRect;
// if (row == editRow && track == editTrack) DrawEdge(hdc, &fillRect, BDR_RAISEDINNER | BDR_SUNKENOUTER, BF_ADJUST | BF_TOP | BF_BOTTOM | BF_LEFT | BF_RIGHT);
FillRect( hdc, &fillRect, bgBrush);
/* if (row % 8 == 0)
if (row % 8 == 0)
{
MoveToEx(hdc, patternDataRect.left, patternDataRect.top, (LPPOINT) NULL);
if (selected) SelectObject(hdc, rowSelectPen);
else SelectObject(hdc, rowPen);
LineTo(hdc, patternDataRect.right, patternDataRect.top);
} */
}
bool drawEditString = false;
if (row == editRow && track == editTrack)
@ -334,7 +338,6 @@ void TrackView::copy()
int rows = selectBottom - selectTop + 1;
int columns = selectRight - selectLeft + 1;
size_t cells = columns * rows;
HGLOBAL hmem = GlobalAlloc(GMEM_MOVEABLE, sizeof(float) * cells);
std::string copyString;
for (int row = selectTop; row <= selectBottom; ++row)
@ -346,12 +349,14 @@ void TrackView::copy()
if (t.isKeyFrame(row)) sprintf(temp, "%.2f\t", t.getKeyFrame(row)->value);
else sprintf(temp, "--- \t");
copyString += temp;
printf("(%d %d) = %s", track, row, temp);
printf("(%d %d) = %s", track - selectLeft, row - selectTop, temp);
}
puts("");
copyString += "\n";
}
HGLOBAL hmem = GlobalAlloc(GMEM_MOVEABLE, sizeof(float) * cells);
HGLOBAL hmem_text = GlobalAlloc(GMEM_MOVEABLE, strlen(copyString.c_str()) + 1);
char *clipbuf = (char *)GlobalLock(hmem_text);
memcpy(clipbuf, copyString.c_str(), strlen(copyString.c_str()) + 1);

View File

@ -101,7 +101,6 @@ private:
InvalidateRect(hwnd, &rect, TRUE);
}
void setEditRow(int newEditRow);
void setEditTrack(int newEditTrack);
@ -121,6 +120,8 @@ private:
HBRUSH bgBaseBrush, bgDarkBrush;
HBRUSH selectBaseBrush, selectDarkBrush;
HPEN rowPen, rowSelectPen;
HBRUSH editBrush;
/* cursor position */
int editRow, editTrack;
@ -134,7 +135,6 @@ private:
std::basic_string<TCHAR> editString;
HWND hwnd;
HBRUSH editBrush;
UINT clipboardFormat;
int rows;