Tracker: style fixes to TextWidget

This commit is contained in:
John Scipione
2014-06-20 21:29:45 -04:00
parent 2be7dbb562
commit 477bd87be1
2 changed files with 15 additions and 3 deletions
+12 -3
View File
@@ -59,9 +59,13 @@ All rights reserved.
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "TextWidget" #define B_TRANSLATION_CONTEXT "TextWidget"
const float kWidthMargin = 20; const float kWidthMargin = 20;
// #pragma mark - BTextWidget
BTextWidget::BTextWidget(Model* model, BColumn* column, BPoseView* view) BTextWidget::BTextWidget(Model* model, BColumn* column, BPoseView* view)
: :
fText(WidgetAttributeText::NewWidgetText(model, column, view)), fText(WidgetAttributeText::NewWidgetText(model, column, view)),
@@ -166,6 +170,7 @@ BTextWidget::CalcRectCommon(BPoint poseLoc, const BColumn* column,
break; break;
default: default:
TRESPASS(); TRESPASS();
break;
} }
result.bottom = poseLoc.y + (view->ListElemHeight() - 1); result.bottom = poseLoc.y + (view->ListElemHeight() - 1);
@@ -217,6 +222,7 @@ BTextWidget::CalcClickRect(BPoint poseLoc, const BColumn* column,
else else
result.right = result.left + kWidthMargin; result.right = result.left + kWidthMargin;
} }
return result; return result;
} }
@@ -413,8 +419,10 @@ BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose)
} }
textView->MakeResizable(true, hitBorder ? NULL : scrollView); textView->MakeResizable(true, hitBorder ? NULL : scrollView);
view->SetActivePose(pose); // tell view about pose view->SetActivePose(pose);
SetActive(true); // for widget // tell view about pose
SetActive(true);
// for widget
textView->SelectAll(); textView->SelectAll();
textView->MakeFocus(); textView->MakeFocus();
@@ -422,7 +430,8 @@ BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose)
// make this text widget invisible while we edit it // make this text widget invisible while we edit it
SetVisible(false); 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()) { if (view->Window()) {
// force immediate redraw so TextView appears instantly // force immediate redraw so TextView appears instantly
+3
View File
@@ -35,9 +35,11 @@ All rights reserved.
#ifndef _TEXT_WIDGET_H #ifndef _TEXT_WIDGET_H
#define _TEXT_WIDGET_H #define _TEXT_WIDGET_H
#include "Model.h" #include "Model.h"
#include "WidgetAttributeText.h" #include "WidgetAttributeText.h"
namespace BPrivate { namespace BPrivate {
class BPose; class BPose;
@@ -185,4 +187,5 @@ BTextWidget::Draw(BRect widgetRect, BRect widgetTextRect, float width,
using namespace BPrivate; using namespace BPrivate;
#endif // _TEXT_WIDGET_H #endif // _TEXT_WIDGET_H