diff --git a/src/kits/tracker/TextWidget.cpp b/src/kits/tracker/TextWidget.cpp index 5686abaaf9..13499b1443 100644 --- a/src/kits/tracker/TextWidget.cpp +++ b/src/kits/tracker/TextWidget.cpp @@ -59,9 +59,13 @@ All rights reserved. #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "TextWidget" + const float kWidthMargin = 20; +// #pragma mark - BTextWidget + + BTextWidget::BTextWidget(Model* model, BColumn* column, BPoseView* view) : fText(WidgetAttributeText::NewWidgetText(model, column, view)), @@ -166,6 +170,7 @@ BTextWidget::CalcRectCommon(BPoint poseLoc, const BColumn* column, break; default: TRESPASS(); + break; } result.bottom = poseLoc.y + (view->ListElemHeight() - 1); @@ -217,6 +222,7 @@ BTextWidget::CalcClickRect(BPoint poseLoc, const BColumn* column, else result.right = result.left + kWidthMargin; } + return result; } @@ -413,8 +419,10 @@ BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose) } textView->MakeResizable(true, hitBorder ? NULL : scrollView); - view->SetActivePose(pose); // tell view about pose - SetActive(true); // for widget + view->SetActivePose(pose); + // tell view about pose + SetActive(true); + // for widget textView->SelectAll(); textView->MakeFocus(); @@ -422,7 +430,8 @@ BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose) // make this text widget invisible while we edit it SetVisible(false); - ASSERT(view->Window()); // how can I not have a Window here??? + ASSERT(view->Window()); + // how can I not have a Window here??? if (view->Window()) { // force immediate redraw so TextView appears instantly diff --git a/src/kits/tracker/TextWidget.h b/src/kits/tracker/TextWidget.h index 6571ec168b..b1c3134a61 100644 --- a/src/kits/tracker/TextWidget.h +++ b/src/kits/tracker/TextWidget.h @@ -35,9 +35,11 @@ All rights reserved. #ifndef _TEXT_WIDGET_H #define _TEXT_WIDGET_H + #include "Model.h" #include "WidgetAttributeText.h" + namespace BPrivate { class BPose; @@ -185,4 +187,5 @@ BTextWidget::Draw(BRect widgetRect, BRect widgetTextRect, float width, using namespace BPrivate; + #endif // _TEXT_WIDGET_H