fix the build
renamed "const float width" to "const float width2" as width is a parameter, please check git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19541 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -13,6 +13,7 @@ Application ShowImage : ShowImageApp.cpp
|
|||||||
Filter.cpp
|
Filter.cpp
|
||||||
EntryMenuItem.cpp
|
EntryMenuItem.cpp
|
||||||
BackgroundImage.cpp
|
BackgroundImage.cpp
|
||||||
|
ResizerWindow.cpp
|
||||||
: be tracker translation
|
: be tracker translation
|
||||||
: ShowImage.rdef
|
: ShowImage.rdef
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -64,16 +64,16 @@ ResizerWindow::ResizerWindow(BMessenger target, float width, float height)
|
|||||||
|
|
||||||
const float textControlWidth = column2 + back_view->StringWidth("999999");
|
const float textControlWidth = column2 + back_view->StringWidth("999999");
|
||||||
const float keepAspectRatioLabelWidth = back_view->StringWidth(kKeepAspectRatioLabel);
|
const float keepAspectRatioLabelWidth = back_view->StringWidth(kKeepAspectRatioLabel);
|
||||||
const float width = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth);
|
const float width2 = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth);
|
||||||
|
|
||||||
ResizeTo(width+1, Bounds().Height()+1);
|
ResizeTo(width2+1, Bounds().Height()+1);
|
||||||
|
|
||||||
const float top = kVerticalIndent;
|
const float top = kVerticalIndent;
|
||||||
const float left = kHorizontalIndent;
|
const float left = kHorizontalIndent;
|
||||||
BRect rect(left, top, width - kHorizontalIndent, top + 10);
|
BRect rect(left, top, width2 - kHorizontalIndent, top + 10);
|
||||||
|
|
||||||
BString widthValue;
|
BString widthValue;
|
||||||
widthValue << (int)width;
|
widthValue << (int)width2;
|
||||||
fWidth = new BTextControl(rect, "width", kWidthLabel, widthValue.String(), NULL);
|
fWidth = new BTextControl(rect, "width", kWidthLabel, widthValue.String(), NULL);
|
||||||
fWidth->SetModificationMessage(new BMessage(kWidthModifiedMsg));
|
fWidth->SetModificationMessage(new BMessage(kWidthModifiedMsg));
|
||||||
AddControl(back_view, fWidth, column2, rect);
|
AddControl(back_view, fWidth, column2, rect);
|
||||||
@@ -97,7 +97,7 @@ ResizerWindow::ResizerWindow(BMessenger target, float width, float height)
|
|||||||
|
|
||||||
fWidth->MakeFocus();
|
fWidth->MakeFocus();
|
||||||
|
|
||||||
ResizeTo(width, rect.top);
|
ResizeTo(width2, rect.top);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
#include "ShowImageUndo.h"
|
#include "ShowImageUndo.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
ShowImageUndo::ShowImageUndo()
|
ShowImageUndo::ShowImageUndo()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user