BBitmap now uses the correct (private) BWindow constructor. Partially implemented that constructor. Fixed another typo in BView, verified and removed some TODOs
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12884 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -2298,10 +2298,8 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
|
|||||||
// dependent on color space.
|
// dependent on color space.
|
||||||
|
|
||||||
if (fInitError == B_OK) {
|
if (fInitError == B_OK) {
|
||||||
if (flags & B_BITMAP_ACCEPTS_VIEWS) {
|
if (flags & B_BITMAP_ACCEPTS_VIEWS)
|
||||||
// TODO: this probably needs to be a special kind of BWindow
|
fWindow = new BWindow(Bounds(), fColorSpace, flags, fBytesPerRow);
|
||||||
fWindow = new BWindow(Bounds(), "offscreen window", B_UNTYPED_WINDOW, 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -563,8 +563,6 @@ BView::ConvertFromScreen(BPoint *pt) const
|
|||||||
|
|
||||||
do_owner_check_no_pick();
|
do_owner_check_no_pick();
|
||||||
|
|
||||||
// TODO: I could be wrong, but shouldn't these
|
|
||||||
// be swapped ?
|
|
||||||
ConvertFromParent(pt);
|
ConvertFromParent(pt);
|
||||||
parent->ConvertFromScreen(pt);
|
parent->ConvertFromScreen(pt);
|
||||||
}
|
}
|
||||||
@@ -609,7 +607,6 @@ BView::ConvertFromScreen(BRect *rect) const
|
|||||||
|
|
||||||
do_owner_check_no_pick();
|
do_owner_check_no_pick();
|
||||||
|
|
||||||
// TODO: See above
|
|
||||||
ConvertFromParent(rect);
|
ConvertFromParent(rect);
|
||||||
parent->ConvertFromScreen(rect);
|
parent->ConvertFromScreen(rect);
|
||||||
}
|
}
|
||||||
@@ -1128,7 +1125,7 @@ BView::DragMessage(BMessage *message, BBitmap *image,
|
|||||||
if (replyTo == NULL)
|
if (replyTo == NULL)
|
||||||
replyTo = this;
|
replyTo = this;
|
||||||
|
|
||||||
if (replyTo->Looper())
|
if (replyTo->Looper() == NULL)
|
||||||
debugger("DragMessage: warning - the Handler needs a looper");
|
debugger("DragMessage: warning - the Handler needs a looper");
|
||||||
|
|
||||||
do_owner_check_no_pick();
|
do_owner_check_no_pick();
|
||||||
|
|||||||
@@ -206,6 +206,17 @@ BWindow::BWindow(BMessage* data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BWindow::BWindow(BRect frame, color_space depth,
|
||||||
|
uint32 bitmapFlags, int32 rowBytes)
|
||||||
|
:
|
||||||
|
BLooper("offscreen bitmap")
|
||||||
|
{
|
||||||
|
// TODO: Implement for real
|
||||||
|
decomposeType(B_UNTYPED_WINDOW, &fLook, &fFeel);
|
||||||
|
InitData(frame, "offscreen", fLook, fFeel, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
BWindow::~BWindow()
|
BWindow::~BWindow()
|
||||||
{
|
{
|
||||||
// the following lines, remove all existing shortcuts and delete accelList
|
// the following lines, remove all existing shortcuts and delete accelList
|
||||||
|
|||||||
Reference in New Issue
Block a user