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

BStringView: added truncation support.

Browse Source 
* Added new truncation mode B_NO_TRUNCATION.
* The Truncation()/SetTruncation() methods itself are Dano-compatible,
  however, there was no B_NO_TRUNCATION.
This commit is contained in:
Axel Dörfler
2015-01-23 21:00:28 +01:00
parent 1bfa46f230
commit 95fdee0bc0
4 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Font.h
+5 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2005-2009, Haiku, Inc. All rights reserved.
* Copyright 2005-2015, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FONT_H_
@@ -43,6 +43,7 @@ enum {
// truncation modes
enum {
B_NO_TRUNCATION = ~0U,
B_TRUNCATE_END = 0,
B_TRUNCATE_BEGINNING = 1,
B_TRUNCATE_MIDDLE = 2,
@@ -150,7 +151,7 @@ struct font_cache_info {
struct tuned_font_info {
float size;
float shear;
float shear;
float rotation;
uint32 flags;
uint16 face;
@@ -275,7 +276,7 @@ private:
friend void _init_global_fonts_();
void _GetExtraFlags() const;
void _GetBoundingBoxes(const char charArray[],
void _GetBoundingBoxes(const char charArray[],
int32 numChars, font_metric_mode mode,
bool string_escapement,
escapement_delta* delta,
@@ -313,7 +314,7 @@ status_t get_font_family(int32 index, font_family* name,
int32 count_font_styles(font_family name);
status_t get_font_style(font_family family, int32 index, font_style* name,
uint32* flags = NULL);
status_t get_font_style(font_family family, int32 index, font_style* name,
status_t get_font_style(font_family family, int32 index, font_style* name,
uint16* face, uint32* flags = NULL);
bool update_font_families(bool checkOnly);
headers/os/interface/StringView.h
+5 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2009, Haiku, Inc. All rights reserved.
* Copyright 2001-2015, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STRING_VIEW_H
@@ -28,6 +28,8 @@ public:
const char* Text() const;
void SetAlignment(alignment flag);
alignment Alignment() const;
void SetTruncation(uint32 truncationMode);
uint32 Truncation() const;
virtual void AttachedToWindow();
virtual void DetachedFromWindow();
@@ -80,9 +82,10 @@ private:
private:
char* fText;
float fStringWidth;
uint32 fTruncation;
alignment fAlign;
BSize fPreferredSize;
};
#endif // _STRING_VIEW_H