Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed "Stippled Zooming" item and made dithering automatic in 8-bit screen mode

Browse Source 
"Keep Proportions" in resizing window became "Keep Original Proportions", which was suggested by korli and is the best suggestion IMO
Bilinear scaling is on by default
I like ShowImage's menus now. :^)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19877 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2007-01-20 03:18:10 +00:00
parent 211a7c8308
commit a9ab9d2c21
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/showimage/ResizerWindow.cpp
View File

@ -43,7 +43,7 @@
static const char* kWidthLabel = "Width:"; static const char* kWidthLabel = "Width:";
static const char* kHeightLabel = "Height:"; static const char* kHeightLabel = "Height:";
static const char* kKeepAspectRatioLabel = "Keep Proportions"; static const char* kKeepAspectRatioLabel = "Keep Original Proportions";
static const char* kApplyLabel = "Apply"; static const char* kApplyLabel = "Apply";
static const float kLineDistance = 5; static const float kLineDistance = 5;
@ -65,7 +65,7 @@ ResizerWindow::ResizerWindow(BMessenger target, int32 width, int32 height)
const float column2 = max_c(widthLabelWidth, heightLabelWidth); const float column2 = max_c(widthLabelWidth, heightLabelWidth);
const float textControlWidth = column2 + back_view->StringWidth("999999"); const float textControlWidth = column2 + back_view->StringWidth("999999");
const float keepAspectRatioLabelWidth = 15 + back_view->StringWidth(kKeepAspectRatioLabel); const float keepAspectRatioLabelWidth = 20 + back_view->StringWidth(kKeepAspectRatioLabel);
const float width2 = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth); const float width2 = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth);
ResizeTo(width2+1, Bounds().Height()+1); ResizeTo(width2+1, Bounds().Height()+1);

4
src/apps/showimage/ShowImageView.cpp
View File

@ -181,7 +181,7 @@ ShowImageView::ShowImageView(BRect rect, const char *name, uint32 resizingMode,
settings = my_app->Settings(); settings = my_app->Settings();
InitPatterns(); InitPatterns();
fDither = false; fDither = BScreen().ColorSpace() == B_CMAP8;
fBitmap = NULL; fBitmap = NULL;
fDisplayBitmap = NULL; fDisplayBitmap = NULL;
fSelBitmap = NULL; fSelBitmap = NULL;
@ -197,7 +197,7 @@ ShowImageView::ShowImageView(BRect rect, const char *name, uint32 resizingMode,
fShowCaption = false; fShowCaption = false;
fZoom = 1.0; fZoom = 1.0;
fMovesImage = false; fMovesImage = false;
fScaleBilinear = false; fScaleBilinear = true;
fScaler = NULL; fScaler = NULL;
#if DELAYED_SCALING #if DELAYED_SCALING
fScalingCountDown = SCALING_DELAY_TIME; fScalingCountDown = SCALING_DELAY_TIME;

6
src/apps/showimage/ShowImageWindow.cpp
View File

@ -246,7 +246,6 @@ ShowImageWindow::BuildViewMenu(BMenu *menu, bool popupMenu)
menu->AddSeparatorItem(); menu->AddSeparatorItem();
AddItemMenu(menu, "High-Quality Zooming", MSG_SCALE_BILINEAR, 0, 0, 'W', true); AddItemMenu(menu, "High-Quality Zooming", MSG_SCALE_BILINEAR, 0, 0, 'W', true);
AddItemMenu(menu, "Stippled Zooming", MSG_DITHER_IMAGE, 0, 0, 'W', true);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
@ -1197,4 +1196,9 @@ ShowImageWindow::QuitRequested()
} }
void
ShowImageWindow::ScreenChanged(BRect frame, color_space mode)
{
fImageView->SetDither(mode == B_CMAP8);
}

1
src/apps/showimage/ShowImageWindow.h
View File

@ -43,6 +43,7 @@ class ShowImageWindow : public BWindow {
virtual void FrameResized(float width, float height); virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage *message); virtual void MessageReceived(BMessage *message);
virtual bool QuitRequested(); virtual bool QuitRequested();
virtual void ScreenChanged(BRect frame, color_space mode);
// virtual void Zoom(BPoint origin, float width, float height); // virtual void Zoom(BPoint origin, float width, float height);
status_t InitCheck(); status_t InitCheck();