* cleanup
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27879 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
dee62ec06b
commit
fe811b9829
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Objects of this class can manage one or more of the DiagramItem
|
Objects of this class can manage one or more of the DiagramItem
|
||||||
type M_BOX, M_WIRE and M_ENDPOINT. Many methods let you specify
|
type M_BOX, M_WIRE and M_ENDPOINT. Many methods let you specify
|
||||||
which type of item you want to deal with.
|
which type of item you want to deal with.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "DiagramItemGroup.h"
|
#include "DiagramItemGroup.h"
|
||||||
@ -317,7 +317,7 @@ DiagramItemGroup::DrawItems(BRect updateRect, uint32 whichType, BRegion* updateR
|
|||||||
if (whichType & DiagramItem::M_BOX) {
|
if (whichType & DiagramItem::M_BOX) {
|
||||||
for (int32 i = CountItems(DiagramItem::M_BOX) - 1; i >= 0; i--) {
|
for (int32 i = CountItems(DiagramItem::M_BOX) - 1; i >= 0; i--) {
|
||||||
DiagramItem *item = ItemAt(i, DiagramItem::M_BOX);
|
DiagramItem *item = ItemAt(i, DiagramItem::M_BOX);
|
||||||
if (item && item->Frame().Intersects(updateRect)) {
|
if (item && item->Frame().Intersects(updateRect)) {
|
||||||
item->Draw(updateRect);
|
item->Draw(updateRect);
|
||||||
if (updateRegion)
|
if (updateRegion)
|
||||||
updateRegion->Exclude(item->Frame());
|
updateRegion->Exclude(item->Frame());
|
||||||
|
@ -136,7 +136,7 @@ void MediaJack::attachedToDiagram()
|
|||||||
void MediaJack::detachedFromDiagram()
|
void MediaJack::detachedFromDiagram()
|
||||||
{
|
{
|
||||||
D_METHOD(("MediaJack::detachedFromDiagram()\n"));
|
D_METHOD(("MediaJack::detachedFromDiagram()\n"));
|
||||||
|
|
||||||
// make sure we're no longer displaying a tooltip
|
// make sure we're no longer displaying a tooltip
|
||||||
TipManager *tips = TipManager::Instance();
|
TipManager *tips = TipManager::Instance();
|
||||||
tips->hideTip(view()->ConvertToScreen(Frame()));
|
tips->hideTip(view()->ConvertToScreen(Frame()));
|
||||||
@ -241,7 +241,7 @@ void MediaJack::MouseOver(
|
|||||||
TipManager *tips = TipManager::Instance();
|
TipManager *tips = TipManager::Instance();
|
||||||
BString tipText = m_label.String();
|
BString tipText = m_label.String();
|
||||||
tipText << " (" << MediaString::getStringFor(m_format.type) << ")";
|
tipText << " (" << MediaString::getStringFor(m_format.type) << ")";
|
||||||
tips->showTip(tipText.String(),view()->ConvertToScreen(Frame()),
|
tips->showTip(tipText.String(),view()->ConvertToScreen(Frame()),
|
||||||
TipManager::LEFT_OFFSET_FROM_POINTER, BPoint(12.0, 8.0));
|
TipManager::LEFT_OFFSET_FROM_POINTER, BPoint(12.0, 8.0));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -364,7 +364,7 @@ void MediaJack::setPosition(
|
|||||||
void MediaJack::_updateBitmap()
|
void MediaJack::_updateBitmap()
|
||||||
{
|
{
|
||||||
D_METHOD(("MediaJack::_updateBitmap()\n"));
|
D_METHOD(("MediaJack::_updateBitmap()\n"));
|
||||||
|
|
||||||
if (m_bitmap)
|
if (m_bitmap)
|
||||||
{
|
{
|
||||||
delete m_bitmap;
|
delete m_bitmap;
|
||||||
@ -404,7 +404,7 @@ void MediaJack::_drawInto(
|
|||||||
{
|
{
|
||||||
BRect r;
|
BRect r;
|
||||||
BPoint p;
|
BPoint p;
|
||||||
|
|
||||||
// fill rect
|
// fill rect
|
||||||
r = targetRect;
|
r = targetRect;
|
||||||
target->SetLowColor(M_GRAY_COLOR);
|
target->SetLowColor(M_GRAY_COLOR);
|
||||||
@ -684,7 +684,7 @@ void MediaJack::_updateAbbreviation()
|
|||||||
D_METHOD(("MediaJack::_updateAbbreviation()\n"));
|
D_METHOD(("MediaJack::_updateAbbreviation()\n"));
|
||||||
|
|
||||||
int32 offset;
|
int32 offset;
|
||||||
m_abbreviation = "";
|
m_abbreviation = "";
|
||||||
m_abbreviation += m_label[0];
|
m_abbreviation += m_label[0];
|
||||||
offset = m_label.FindFirst(" ") + 1;
|
offset = m_label.FindFirst(" ") + 1;
|
||||||
if ((offset > 1) && (offset < m_label.CountChars() - 1))
|
if ((offset > 1) && (offset < m_label.CountChars() - 1))
|
||||||
@ -714,7 +714,7 @@ void MediaJack::showContextMenu(
|
|||||||
media_input input;
|
media_input input;
|
||||||
getInput(&input);
|
getInput(&input);
|
||||||
BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
|
BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
|
||||||
message->AddData("input", B_RAW_TYPE,
|
message->AddData("input", B_RAW_TYPE,
|
||||||
reinterpret_cast<const void *>(&input), sizeof(input));
|
reinterpret_cast<const void *>(&input), sizeof(input));
|
||||||
menu->AddItem(item = new BMenuItem("Get Info", message));
|
menu->AddItem(item = new BMenuItem("Get Info", message));
|
||||||
}
|
}
|
||||||
@ -723,7 +723,7 @@ void MediaJack::showContextMenu(
|
|||||||
media_output output;
|
media_output output;
|
||||||
getOutput(&output);
|
getOutput(&output);
|
||||||
BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
|
BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
|
||||||
message->AddData("output", B_RAW_TYPE,
|
message->AddData("output", B_RAW_TYPE,
|
||||||
reinterpret_cast<const void *>(&output), sizeof(output));
|
reinterpret_cast<const void *>(&output), sizeof(output));
|
||||||
menu->AddItem(item = new BMenuItem("Get Info", message));
|
menu->AddItem(item = new BMenuItem("Get Info", message));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user