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

Expander: replace string manip with asprintf()

Browse Source
This commit is contained in:
John Scipione 2014-06-09 15:25:44 -04:00
parent e326cef620
commit 1e35cfaea2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/expander/DirectoryFilePanel.cpp
View File

@ -14,6 +14,7 @@
#include <Window.h> #include <Window.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <compat/sys/stat.h> #include <compat/sys/stat.h>
@ -106,14 +107,6 @@ DirectoryFilePanel::SelectionChanged()
{ {
Window()->Lock(); Window()->Lock();
char label[64];
entry_ref ref;
GetPanelDirectory(&ref);
if (snprintf(label, sizeof(label),
B_TRANSLATE("Select '%s'"), ref.name) >= (int)sizeof(label)) {
strcpy(label + sizeof(label) - 5, B_UTF8_ELLIPSIS "'");
}
// Resize button so that the label fits // Resize button so that the label fits
// maximum width is dictated by the window's size limits // maximum width is dictated by the window's size limits
@ -123,7 +116,14 @@ DirectoryFilePanel::SelectionChanged()
maxWidth -= Window()->Bounds().Width() + 8 - fCurrentButton->Frame().right; maxWidth -= Window()->Bounds().Width() + 8 - fCurrentButton->Frame().right;
BRect oldBounds = fCurrentButton->Bounds(); BRect oldBounds = fCurrentButton->Bounds();
char* label;
entry_ref ref;
GetPanelDirectory(&ref);
asprintf(&label, B_TRANSLATE("Select '%s'" B_UTF8_ELLIPSIS), ref.name);
fCurrentButton->SetLabel(label); fCurrentButton->SetLabel(label);
free(label);
float width; float width;
float height; float height;
fCurrentButton->GetPreferredSize(&width, &height); fCurrentButton->GetPreferredSize(&width, &height);