git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/AxWin3 WM - Fixed cursor position not changing in edit control when arrow...
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
renderers
/
widget
/
disptext.c
diff --git
a/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c
b/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c
index
4ea4833
..
d3abdea
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c
+++ b/
Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c
@@
-17,7
+17,7
@@
void Widget_DispText_Render(tWindow *Window, tElement *Element)
Element->CachedX+1, Element->CachedY+1,
Element->CachedW-2, Element->CachedH-2,
NULL, TEXT_COLOUR,
Element->CachedX+1, Element->CachedY+1,
Element->CachedW-2, Element->CachedH-2,
NULL, TEXT_COLOUR,
- Element->Text
+ Element->Text
, -1
);
}
);
}
@@
-28,24
+28,19
@@
void Widget_DispText_UpdateText(tElement *Element, const char *Text)
if(Element->Text) free(Element->Text);
Element->Text = strdup(Text);
if(Element->Text) free(Element->Text);
Element->Text = strdup(Text);
- WM_Render_GetTextDims(NULL, Element->Text, &w, &h);
+ WM_Render_GetTextDims(NULL, Element->Text,
-1,
&w, &h);
// Apply edge padding
w += 2; h += 2;
// Apply edge padding
w += 2; h += 2;
- if(Element->Parent && (Element->Parent->Flags & ELEFLAG_VERTICAL)) {
- Element->MinCross = w;
- Element->MinWith = h;
- }
- else {
- Element->MinWith = w;
- Element->MinCross = h;
- }
+ Element->MinW = w;
+ Element->MinH = h;
Widget_UpdateMinDims(Element->Parent);
}
DEFWIDGETTYPE(ELETYPE_TEXT,
Widget_UpdateMinDims(Element->Parent);
}
DEFWIDGETTYPE(ELETYPE_TEXT,
+ WIDGETTYPE_FLAG_NOCHILDREN,
.Render = Widget_DispText_Render,
.UpdateText = Widget_DispText_UpdateText
);
.Render = Widget_DispText_Render,
.UpdateText = Widget_DispText_UpdateText
);
UCC
git Repository :: git.ucc.asn.au