RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Committed patch from Nz (forum user Gogg) to support text overflow in PGEntry

This commit is contained in:
rdb 2009-10-29 12:20:29 +00:00
parent 521f5491b2
commit 86aa00e1b9
6 changed files with 116 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
panda/src/pgui/pgEntry.I
View File

@ -385,6 +385,38 @@ get_obscure_mode() const {
return _obscure_mode;
}
////////////////////////////////////////////////////////////////////
// Function: PGEntry::set_overflow_mode
// Access: Published
// Description: Specifies whether overflow mode should be enabled.
// In overflow mode, text can overflow the boundaries
// of the Entry element horizontally.
//
// Overflow mode only works when the number of lines
// is 1.
////////////////////////////////////////////////////////////////////
INLINE void PGEntry::
set_overflow_mode(bool flag) {
LightReMutexHolder holder(_lock);
if (_overflow_mode != flag) {
_overflow_mode = flag;
_text_geom_stale = true;
_cursor_stale = true;
}
}
////////////////////////////////////////////////////////////////////
// Function: PGEntry::get_overflow_mode
// Access: Published
// Description: Specifies whether overflow mode is enabled. See
// set_overflow_mode().
////////////////////////////////////////////////////////////////////
INLINE bool PGEntry::
get_overflow_mode() const {
LightReMutexHolder holder(_lock);
return _overflow_mode;
}
////////////////////////////////////////////////////////////////////
// Function: PGEntry::set_candidate_active
// Access: Published

48
panda/src/pgui/pgEntry.cxx
View File

@ -71,6 +71,9 @@ PGEntry(const string &name) :
_cursor_keys_active = true;
_obscure_mode = false;
_overflow_mode = false;
_current_padding = 0.0f;
set_active(true);
update_state();
@ -114,7 +117,8 @@ PGEntry(const PGEntry &copy) :
_blink_start(copy._blink_start),
_blink_rate(copy._blink_rate),
_cursor_keys_active(copy._cursor_keys_active),
_obscure_mode(copy._obscure_mode)
_obscure_mode(copy._obscure_mode),
_overflow_mode(copy._overflow_mode)
{
_cursor_stale = true;
_last_text_def = (TextNode *)NULL;
@ -210,6 +214,8 @@ press(const MouseWatcherParameter &param, bool background) {
// Make sure _text is initialized properly.
update_text();
bool overflow_mode = get_overflow_mode() && _num_lines == 1;
ButtonHandle button = param.get_button();
if (button == MouseButton::one() ||
@ -268,6 +274,9 @@ press(const MouseWatcherParameter &param, bool background) {
type(param);
}
_cursor_stale = true;
if (overflow_mode){
_text_geom_stale = true;
}
}
} else if (button == KeyboardButton::right()) {
@ -281,6 +290,9 @@ press(const MouseWatcherParameter &param, bool background) {
type(param);
}
_cursor_stale = true;
if (overflow_mode){
_text_geom_stale = true;
}
}
} else if (button == KeyboardButton::home()) {
@ -288,6 +300,9 @@ press(const MouseWatcherParameter &param, bool background) {
// Home. Move the cursor position to the beginning.
_cursor_position = 0;
_cursor_stale = true;
if (overflow_mode){
_text_geom_stale = true;
}
type(param);
}
@ -296,6 +311,9 @@ press(const MouseWatcherParameter &param, bool background) {
// End. Move the cursor position to the end.
_cursor_position = _text.get_num_characters();
_cursor_stale = true;
if (overflow_mode){
_text_geom_stale = true;
}
type(param);
}
}
@ -339,10 +357,14 @@ keystroke(const MouseWatcherParameter &param, bool background) {
} else {
_cursor_position = min(_cursor_position, _text.get_num_characters());
bool too_long = !_text.set_wsubstr(new_char, _cursor_position, 0);
bool overflow_mode = get_overflow_mode() && _num_lines == 1;
if(overflow_mode){
too_long = false;
}
if (_obscure_mode) {
too_long = !_obscure_text.set_wtext(wstring(_text.get_num_characters(), '*'));
} else {
if (!too_long && (_text.get_num_rows() == _num_lines)) {
if (!too_long && (_text.get_num_rows() == _num_lines) && !overflow_mode) {
// If we've filled up all of the available lines, we
// must also ensure that the last line is not too long
// (it might be, because of additional whitespace on
@ -354,7 +376,7 @@ keystroke(const MouseWatcherParameter &param, bool background) {
too_long = (last_line_width > _max_width);
}
if (!too_long && keycode == ' ') {
if (!too_long && keycode == ' ' && !overflow_mode) {
// Even if we haven't filled up all of the available
// lines, we should reject a space that's typed at the
// end of the current line if it would make that line
@ -750,7 +772,7 @@ void PGEntry::
update_text() {
TextNode *node = get_text_def(get_state());
nassertv(node != (TextNode *)NULL);
if (_text_geom_stale || node != _last_text_def) {
TextProperties props = *node;
props.set_wordwrap(_max_width);
@ -765,6 +787,8 @@ update_text() {
_last_text_def = node;
}
_text.set_multiline_mode (!(get_overflow_mode() && _num_lines == 1));
PT(PandaNode) assembled;
if (_obscure_mode) {
_obscure_text.set_properties(props);
@ -811,7 +835,21 @@ update_text() {
_current_text =
_text_render_root.attach_new_node(assembled);
_current_text.set_mat(node->get_transform());
if (get_overflow_mode() && _num_lines == 1){
float padding = (_text.get_xpos(0, _cursor_position) - _max_width);
if (padding < 0){
padding = 0;
}
_current_text.set_x(_current_text.get_x() - padding);
_current_text.set_scissor(NodePath(this),
LPoint3f(0, 0, -0.5), LPoint3f(_max_width, 0, -0.5),
LPoint3f(_max_width, 0, 1.5), LPoint3f(0, 0, 1.5));
_current_padding = padding;
}
_text_geom_stale = false;
_text_geom_flattened = false;
_cursor_stale = true;
@ -855,7 +893,7 @@ update_cursor() {
ypos = _text.get_ypos(row, column);
}
_cursor_def.set_pos(xpos, 0.0f, ypos);
_cursor_def.set_pos(xpos - _current_padding, 0.0f, ypos);
_cursor_stale = false;
cursormove();

6
panda/src/pgui/pgEntry.h
View File

@ -107,6 +107,9 @@ PUBLISHED:
INLINE void set_obscure_mode(bool flag);
INLINE bool get_obscure_mode() const;
INLINE void set_overflow_mode(bool flag);
INLINE bool get_overflow_mode() const;
INLINE void set_candidate_active(const string &candidate_active);
INLINE const string &get_candidate_active() const;
@ -192,6 +195,9 @@ private:
bool _cursor_keys_active;
bool _obscure_mode;
bool _overflow_mode;
float _current_padding;
public:
static TypeHandle get_class_type() {

22
panda/src/text/textAssembler.I
View File

@ -89,6 +89,28 @@ get_dynamic_merge() const {
return _dynamic_merge;
}
////////////////////////////////////////////////////////////////////
// Function: TextAssembler::set_multiline_mode
// Access: Published
// Description: Sets the multiline mode flag. Set the multiline
// mode to allow text to wrap. It defaults to true.
////////////////////////////////////////////////////////////////////
INLINE void TextAssembler::
set_multiline_mode(bool flag) {
_multiline_mode = flag;
}
////////////////////////////////////////////////////////////////////
// Function: TextAssembler::get_multiline_mode
// Access: Published
// Description: Returns the multline_mode flag. See
// TextNode::set_multiline_mode().
////////////////////////////////////////////////////////////////////
INLINE bool TextAssembler::
get_multiline_mode() const {
return _multiline_mode;
}
////////////////////////////////////////////////////////////////////
// Function: TextAssembler::set_properties
// Access: Published

11
panda/src/text/textAssembler.cxx
View File

@ -89,7 +89,8 @@ TextAssembler(TextEncoder *encoder) :
_encoder(encoder),
_usage_hint(Geom::UH_static),
_max_rows(0),
_dynamic_merge(text_dynamic_merge)
_dynamic_merge(text_dynamic_merge),
_multiline_mode(true)
{
_initial_cprops = new ComputedProperties(TextProperties());
clear();
@ -111,7 +112,8 @@ TextAssembler(const TextAssembler &copy) :
_encoder(copy._encoder),
_usage_hint(copy._usage_hint),
_max_rows(copy._max_rows),
_dynamic_merge(copy._dynamic_merge)
_dynamic_merge(copy._dynamic_merge),
_multiline_mode(copy._multiline_mode)
{
}
@ -132,6 +134,7 @@ operator = (const TextAssembler &copy) {
_usage_hint = copy._usage_hint;
_max_rows = copy._max_rows;
_dynamic_merge = copy._dynamic_merge;
_multiline_mode = copy._multiline_mode;
}
////////////////////////////////////////////////////////////////////
@ -1123,7 +1126,9 @@ wordwrap_text() {
}
_text_block.push_back(TextRow(p));
}
needs_newline = true;
if (get_multiline_mode()){
needs_newline = true;
}
if (_text_string[next_start - 1]._cprops->_properties.get_preserve_trailing_whitespace()) {
q = next_start;

5
panda/src/text/textAssembler.h
View File

@ -61,6 +61,9 @@ PUBLISHED:
INLINE void set_dynamic_merge(bool dynamic_merge);
INLINE bool get_dynamic_merge() const;
INLINE void set_multiline_mode(bool flag);
INLINE bool get_multiline_mode() const;
INLINE void set_properties(const TextProperties &properties);
INLINE const TextProperties &get_properties() const;
@ -305,6 +308,8 @@ private:
Geom::UsageHint _usage_hint;
int _max_rows;
bool _dynamic_merge;
bool _multiline_mode;
};
#include "textAssembler.I"