Removed beep when Go() is called because Be's version doesn't beep, fixed button sizes in B_WIDTH_FROM_LABEL mode.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11136 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -255,8 +255,6 @@ char BAlert::Shortcut(int32 index) const
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
int32 BAlert::Go()
|
int32 BAlert::Go()
|
||||||
{
|
{
|
||||||
system_beep(NULL); // forces the "beep" event
|
|
||||||
|
|
||||||
fAlertSem = create_sem(0, "AlertSem");
|
fAlertSem = create_sem(0, "AlertSem");
|
||||||
if (fAlertSem < B_OK)
|
if (fAlertSem < B_OK)
|
||||||
{
|
{
|
||||||
@@ -535,7 +533,11 @@ void BAlert::InitObject(const char* text, const char* button0,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case B_WIDTH_FROM_LABEL:
|
case B_WIDTH_FROM_LABEL:
|
||||||
fButtons[i]->ResizeToPreferred();
|
fButtons[i]->GetPreferredSize(&buttonWidth, &buttonHeight);
|
||||||
|
// GetPreferredSize() does not return the minimum width required to
|
||||||
|
// fit the label. Thus, the width is computed here.
|
||||||
|
buttonWidth = fButtons[i]->StringWidth(fButtons[i]->Label()) + 20.0f;
|
||||||
|
fButtons[i]->ResizeTo(buttonWidth, buttonHeight);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: // B_WIDTH_AS_USUAL
|
default: // B_WIDTH_AS_USUAL
|
||||||
|
|||||||
Reference in New Issue
Block a user