i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Magnify: fix layout with big font sizes

Browse Source 
* Move the menu to the left side so it doesn't overlap the status.
* Fixes #6934.
This commit is contained in:
Adrien Destugues
2014-12-05 10:20:44 +01:00
parent 6db90d17a1
commit 654d47f356
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/magnify/Magnify.cpp
+6 -5
View File
@@ -134,7 +134,8 @@ BuildInfoMenu(BMenu *menu)
menuItem = new BMenuItem(B_TRANSLATE("Save image"), menuItem = new BMenuItem(B_TRANSLATE("Save image"),
new BMessage(msg_save), 'S'); new BMessage(msg_save), 'S');
menu->AddItem(menuItem); menu->AddItem(menuItem);
// menuItem = new BMenuItem(B_TRANSLATE("Save selection"), new BMessage(msg_save),'S'); // menuItem = new BMenuItem(B_TRANSLATE("Save selection"),
// new BMessage(msg_save), 'S');
// menu->AddItem(menuItem); // menu->AddItem(menuItem);
menuItem = new BMenuItem(B_TRANSLATE("Copy image"), menuItem = new BMenuItem(B_TRANSLATE("Copy image"),
new BMessage(msg_copy_image), 'C'); new BMessage(msg_copy_image), 'C');
@@ -827,7 +828,7 @@ TInfoView::Draw(BRect updateRect)
dynamic_cast<TWindow*>(Window())->PixelCount(&hPixelCount, &vPixelCount); dynamic_cast<TWindow*>(Window())->PixelCount(&hPixelCount, &vPixelCount);
int32 pixelSize = dynamic_cast<TWindow*>(Window())->PixelSize(); int32 pixelSize = dynamic_cast<TWindow*>(Window())->PixelSize();
MovePenTo(10, fFontHeight + 5); MovePenTo(15 + fPopUp->Bounds().Width(), fFontHeight + 5);
static BMessageFormat format(B_TRANSLATE("%width x %height @ {0, plural, " static BMessageFormat format(B_TRANSLATE("%width x %height @ {0, plural, "
"one{# pixel/pixel} other{# pixels/pixel}}")); "one{# pixel/pixel} other{# pixels/pixel}}"));
@@ -857,7 +858,7 @@ TInfoView::Draw(BRect updateRect)
snprintf(str, sizeof(str), "R: %i G: %i B: %i (#%02x%02x%02x)", snprintf(str, sizeof(str), "R: %i G: %i B: %i (#%02x%02x%02x)",
color.red, color.green, color.blue, color.red, color.green, color.blue); color.red, color.green, color.blue, color.red, color.green, color.blue);
MovePenTo(10, fFontHeight*2+5); MovePenTo(15 + fPopUp->Bounds().Width(), fFontHeight*2+5);
invalRect.Set(10, fFontHeight+7, 10 + StringWidth(fRGBStr), fFontHeight*2+7); invalRect.Set(10, fFontHeight+7, 10 + StringWidth(fRGBStr), fFontHeight*2+7);
SetHighColor(ViewColor()); SetHighColor(ViewColor());
FillRect(invalRect); FillRect(invalRect);
@@ -928,9 +929,9 @@ TInfoView::AddMenu()
fMenu = new TMenu(dynamic_cast<TWindow*>(Window()), ""); fMenu = new TMenu(dynamic_cast<TWindow*>(Window()), "");
BuildInfoMenu(fMenu); BuildInfoMenu(fMenu);
BRect r(Bounds().Width()-27, 11, Bounds().Width()-11, 27); BRect r(9, 11, 22, 27);
fPopUp = new BMenuField( r, "region menu", NULL, fMenu, true, fPopUp = new BMenuField( r, "region menu", NULL, fMenu, true,
B_FOLLOW_RIGHT | B_FOLLOW_TOP); B_FOLLOW_LEFT | B_FOLLOW_TOP);
AddChild(fPopUp); AddChild(fPopUp);
} }