i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added code to merge selection with background image; removed Select None item, replaced it with Clear as Select None was behaving like Be ShowImage's Clear anyway; properly enabled/disabled Edit menu items when selection is made or cleared. Still no undo yet, but I'm planning to do that after Paste is implemented.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5403 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber
2003-11-18 02:48:53 +00:00
parent 497c0bf9c1
commit 8ad30bcf80
4 changed files with 90 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/showimage/ShowImageView.cpp
+70 -25
View File
@@ -625,30 +625,10 @@ ShowImageView::Draw(BRect updateRect)
if (HasSelection()) {
if (fSelBitmap) {
BRect clippedRect, bounds;
clippedRect = fSelectionRect;
ConstrainToImage(clippedRect);
clippedRect = ImageToView(clippedRect);
bounds = fSelectionRect;
if (bounds.left < 0)
bounds.left = -(bounds.left);
else
bounds.left = 0;
if (bounds.top < 0)
bounds.top = -(bounds.top);
else
bounds.top = 0;
if (bounds.right > fBitmap->Bounds().right)
bounds.right = bounds.left + clippedRect.Width();
else
bounds.right = fSelBitmap->Bounds().right;
if (bounds.bottom > fBitmap->Bounds().bottom)
bounds.bottom = bounds.top + clippedRect.Height();
else
bounds.bottom = fSelBitmap->Bounds().bottom;
DrawBitmap(fSelBitmap, bounds, clippedRect);
BRect srcBits, destRect;
GetSelMergeRects(srcBits, destRect);
destRect = ImageToView(destRect);
DrawBitmap(fSelBitmap, srcBits, destRect);
}
DrawSelectionBox(fSelectionRect);
}
@@ -924,6 +904,61 @@ ShowImageView::GetMouseButtons()
return buttons;
}
void
ShowImageView::GetSelMergeRects(BRect &srcBits, BRect &destRect)
{
destRect = fSelectionRect;
ConstrainToImage(destRect);
srcBits = fSelectionRect;
if (srcBits.left < 0)
srcBits.left = -(srcBits.left);
else
srcBits.left = 0;
if (srcBits.top < 0)
srcBits.top = -(srcBits.top);
else
srcBits.top = 0;
if (srcBits.right > fBitmap->Bounds().right)
srcBits.right = srcBits.left + destRect.Width();
else
srcBits.right = fSelBitmap->Bounds().right;
if (srcBits.bottom > fBitmap->Bounds().bottom)
srcBits.bottom = srcBits.top + destRect.Height();
else
srcBits.bottom = fSelBitmap->Bounds().bottom;
}
void
ShowImageView::MergeSelection()
{
if (!HasSelection() || !fSelBitmap)
return;
// Merge selection with background
BView view(fBitmap->Bounds(), NULL, B_FOLLOW_NONE, B_WILL_DRAW);
BBitmap *bitmap = new BBitmap(fBitmap->Bounds(), fBitmap->ColorSpace(), true);
if (bitmap == NULL)
return;
if (bitmap->Lock()) {
bitmap->AddChild(&view);
view.DrawBitmap(fBitmap, fBitmap->Bounds());
BRect srcBits, destRect;
GetSelMergeRects(srcBits, destRect);
view.DrawBitmap(fSelBitmap, srcBits, destRect);
view.Sync();
bitmap->RemoveChild(&view);
bitmap->Unlock();
DeleteBitmap();
fBitmap = bitmap;
} else
delete bitmap;
}
void
ShowImageView::MouseDown(BPoint position)
{
@@ -971,6 +1006,11 @@ ShowImageView::MouseDown(BPoint position)
AnimateSelection(true);
} else if (buttons == B_PRIMARY_MOUSE_BUTTON) {
if (HasSelection())
// If there is an existing selection,
// Make it part of the background image
MergeSelection();
// begin new selection
SetHasSelection(true);
fMakesSelection = true;
@@ -1271,7 +1311,7 @@ ShowImageView::SelectAll()
}
void
ShowImageView::Unselect()
ShowImageView::ClearSelection()
{
if (HasSelection()) {
SetHasSelection(false);
@@ -1284,6 +1324,11 @@ ShowImageView::SetHasSelection(bool bHasSelection)
{
DeleteSelBitmap();
fbHasSelection = bHasSelection;
BMessage msg(MSG_SELECTION);
msg.AddBool("has_selection", fbHasSelection);
BMessenger msgr(Window());
msgr.SendMessage(&msg);
}
void