Author: stippi Date: 2010-03-17 13:39:24 +0100 (Wed, 17 Mar 2010) New Revision: 35891 Changeset: http://dev.haiku-os.org/changeset/35891/haiku Modified: haiku/trunk/src/kits/tracker/Cursors.h haiku/trunk/src/kits/tracker/PoseView.cpp haiku/trunk/src/kits/tracker/TitleView.cpp Log: Use the new cursors. Modified: haiku/trunk/src/kits/tracker/Cursors.h =================================================================== --- haiku/trunk/src/kits/tracker/Cursors.h 2010-03-17 12:31:51 UTC (rev 35890) +++ haiku/trunk/src/kits/tracker/Cursors.h 2010-03-17 12:39:24 UTC (rev 35891) @@ -9,18 +9,9 @@ #define CURSORS_H // Exported with Wonderbrush from haiku/data/artwork/cursors/Overlays_Tracker +// TODO: Don't use these, there are new cursors, which you can use by ID. +// (Except for the kMoveCursor, which has different meaning here.) -const unsigned char kCopyCursor[] = {16, 1, 0, 1, - 0x70, 0x00, 0x48, 0x00, 0x48, 0x00, 0x27, 0xc0, - 0x24, 0xb8, 0x12, 0x54, 0x10, 0x02, 0x78, 0x02, - 0x98, 0x02, 0x84, 0x1c, 0x60, 0x14, 0x18, 0x77, - 0x04, 0x41, 0x00, 0x77, 0x00, 0x14, 0x00, 0x1c, - - 0x70, 0x00, 0x78, 0x00, 0x78, 0x00, 0x3f, 0xc0, - 0x3f, 0xf8, 0x1f, 0xfc, 0x1f, 0xfe, 0x7f, 0xfe, - 0xff, 0xfe, 0xff, 0xfc, 0x7f, 0xfc, 0x1f, 0xff, - 0x07, 0xff, 0x01, 0xff, 0x00, 0x1c, 0x00, 0x1c}; - const unsigned char kMoveCursor[] = {16, 1, 0, 1, 0x70, 0x00, 0x48, 0x00, 0x48, 0x00, 0x27, 0xc0, 0x24, 0xb8, 0x12, 0x54, 0x10, 0x02, 0x78, 0x02, Modified: haiku/trunk/src/kits/tracker/PoseView.cpp =================================================================== --- haiku/trunk/src/kits/tracker/PoseView.cpp 2010-03-17 12:31:51 UTC (rev 35890) +++ haiku/trunk/src/kits/tracker/PoseView.cpp 2010-03-17 12:39:24 UTC (rev 35891) @@ -9008,7 +9008,7 @@ if (!CheckDevicesEqual(&srcRef, targetModel) && !srcModel.IsVolume() && !srcModel.IsRoot()) { - BCursor copyCursor(kCopyCursor); + BCursor copyCursor(B_CURSOR_ID_COPY); SetViewCursor(©Cursor); return true; } Modified: haiku/trunk/src/kits/tracker/TitleView.cpp =================================================================== --- haiku/trunk/src/kits/tracker/TitleView.cpp 2010-03-17 12:31:51 UTC (rev 35890) +++ haiku/trunk/src/kits/tracker/TitleView.cpp 2010-03-17 12:39:24 UTC (rev 35891) @@ -61,15 +61,7 @@ const rgb_color kHighlightColor = {100, 100, 210, 255}; -const unsigned char kHorizontalResizeCursor[] = { - 16, 1, 7, 7, - 0, 0, 1, 0, 1, 0, 1, 0, 9, 32, 25, 48, 57, 56, 121, 60, - 57, 56, 25, 48, 9, 32, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, - 3, 128, 3, 128, 3, 128, 15, 224, 31, 240, 63, 248, 127, 252, 255, 254, - 127, 252, 63, 248, 31, 240, 15, 224, 3, 128, 3, 128, 3, 128, 0, 0 -}; - static void _DrawLine(BPoseView *view, BPoint from, BPoint to) { @@ -109,7 +101,7 @@ : BView(frame, "TitleView", B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW), fPoseView(view), fTitleList(10, true), - fHorizontalResizeCursor(kHorizontalResizeCursor), + fHorizontalResizeCursor(B_CURSOR_ID_RESIZE_EAST_WEST), fPreviouslyClickedColumnTitle(0), fTrackingState(NULL) {