From cc28efee7e3e566e3fac3a3d494d30a66250e51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 17 Mar 2010 12:43:57 +0000 Subject: [PATCH] Use the new cursors. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35892 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/ColumnListView.cpp | 64 ++++----------------------- 1 file changed, 8 insertions(+), 56 deletions(-) diff --git a/src/kits/interface/ColumnListView.cpp b/src/kits/interface/ColumnListView.cpp index 460aadc005..85f69ca27b 100644 --- a/src/kits/interface/ColumnListView.cpp +++ b/src/kits/interface/ColumnListView.cpp @@ -75,58 +75,6 @@ All rights reserved. namespace BPrivate { -static const unsigned char kResizeCursorData[] = { - 16, 1, 8, 8, - 0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, - 0x1a, 0x58, 0x2a, 0x54, 0x4a, 0x52, 0x8a, 0x51, - 0x8a, 0x51, 0x4a, 0x52, 0x2a, 0x54, 0x1a, 0x58, - 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0, - - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, - 0x1b, 0xd8, 0x3b, 0xdc, 0x7b, 0xde, 0xfb, 0xdf, - 0xfb, 0xdf, 0x7b, 0xde, 0x3b, 0xdc, 0x1b, 0xd8, - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0 -}; - -static const unsigned char kMaxResizeCursorData[] = { - 16, 1, 8, 8, - 0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, - 0x1a, 0x40, 0x2a, 0x40, 0x4a, 0x40, 0x8a, 0x40, - 0x8a, 0x40, 0x4a, 0x40, 0x2a, 0x40, 0x1a, 0x40, - 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0, - - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, - 0x1b, 0xc0, 0x3b, 0xc0, 0x7b, 0xc0, 0xfb, 0xc0, - 0xfb, 0xc0, 0x7b, 0xc0, 0x3b, 0xc0, 0x1b, 0xc0, - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0 -}; - -static const unsigned char kMinResizeCursorData[] = { - 16, 1, 8, 8, - 0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, - 0x02, 0x58, 0x02, 0x54, 0x02, 0x52, 0x02, 0x51, - 0x02, 0x51, 0x02, 0x52, 0x02, 0x54, 0x02, 0x58, - 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0, - - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, - 0x03, 0xd8, 0x03, 0xdc, 0x03, 0xde, 0x03, 0xdf, - 0x03, 0xdf, 0x03, 0xde, 0x03, 0xdc, 0x03, 0xd8, - 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0 -}; - -static const unsigned char kColumnMoveCursorData[] = { - 16, 1, 8, 8, - 0x01, 0x80, 0x02, 0x40, 0x04, 0x20, 0x08, 0x10, - 0x1e, 0x78, 0x2a, 0x54, 0x4e, 0x72, 0x80, 0x01, - 0x80, 0x01, 0x4e, 0x72, 0x2a, 0x54, 0x1e, 0x78, - 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01, 0x80, - - 0x01, 0x80, 0x03, 0xc0, 0x07, 0xe0, 0x0f, 0xf0, - 0x1f, 0xf8, 0x3b, 0xdc, 0x7f, 0xfe, 0xff, 0xff, - 0xff, 0xff, 0x7f, 0xfe, 0x3b, 0xdc, 0x1f, 0xf8, - 0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01, 0x80 -}; - static const unsigned char kDownSortArrow8x8[] = { 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, @@ -2095,10 +2043,14 @@ TitleView::TitleView(BRect rect, OutlineView* horizontalSlave, fUpSortArrow->SetBits((const void*) kUpSortArrow8x8, 64, 0, B_CMAP8); fDownSortArrow->SetBits((const void*) kDownSortArrow8x8, 64, 0, B_CMAP8); - fResizeCursor = new BCursor(kResizeCursorData); - fMinResizeCursor = new BCursor(kMinResizeCursorData); - fMaxResizeCursor = new BCursor(kMaxResizeCursorData); - fColumnMoveCursor = new BCursor(kColumnMoveCursorData); +// fResizeCursor = new BCursor(kResizeCursorData); +// fMinResizeCursor = new BCursor(kMinResizeCursorData); +// fMaxResizeCursor = new BCursor(kMaxResizeCursorData); +// fColumnMoveCursor = new BCursor(kColumnMoveCursorData); + fResizeCursor = new BCursor(B_CURSOR_ID_RESIZE_EAST_WEST); + fMinResizeCursor = new BCursor(B_CURSOR_ID_RESIZE_EAST); + fMaxResizeCursor = new BCursor(B_CURSOR_ID_RESIZE_WEST); + fColumnMoveCursor = new BCursor(B_CURSOR_ID_MOVE); FixScrollBar(true); }