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 - Added proper mid-character clipping to font rendering
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
renderers
/
widget.c
diff --git
a/Usermode/Applications/axwin3_src/WM/renderers/widget.c
b/Usermode/Applications/axwin3_src/WM/renderers/widget.c
index
12566d5
..
247152d
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/renderers/widget.c
+++ b/
Usermode/Applications/axwin3_src/WM/renderers/widget.c
@@
-249,7
+249,7
@@
void Widget_UpdateDimensions(tElement *Element)
if( child->Flags & ELEFLAG_ABSOLUTEPOS ) continue ;
// --- Width ---
if( child->Flags & ELEFLAG_ABSOLUTEPOS ) continue ;
// --- Width ---
- if( child->Flags &
ELEFLAG_NOEXPAND
)
+ if( child->Flags &
(bVertical ? ELEFLAG_NOEXPAND : ELEFLAG_NOSTRETCH)
)
w = child->MinW;
else if( bVertical )
w = child->FixedCross ? child->FixedCross : fullCross;
w = child->MinW;
else if( bVertical )
w = child->FixedCross ? child->FixedCross : fullCross;
@@
-257,7
+257,7
@@
void Widget_UpdateDimensions(tElement *Element)
w = child->FixedWith ? child->FixedWith : dynWith;
// --- Height ---
w = child->FixedWith ? child->FixedWith : dynWith;
// --- Height ---
- if( child->Flags &
ELEFLAG_NOSTRETCH
)
+ if( child->Flags &
(bVertical ? ELEFLAG_NOSTRETCH : ELEFLAG_NOEXPAND)
)
h = child->MinH;
else if( bVertical )
h = child->FixedWith ? child->FixedWith : dynWith;
h = child->MinH;
else if( bVertical )
h = child->FixedWith ? child->FixedWith : dynWith;
@@
-766,6
+766,7
@@
void Widget_Fire(tElement *Element)
{
tWidgetMsg_Fire msg;
msg.WidgetID = Element->ID;
{
tWidgetMsg_Fire msg;
msg.WidgetID = Element->ID;
+ _SysDebug("Widget_Fire: Fire on %p %i", Element->Window, Element->ID);
WM_SendMessage(Element->Window, Element->Window, MSG_WIDGET_FIRE, sizeof(msg), &msg);
}
WM_SendMessage(Element->Window, Element->Window, MSG_WIDGET_FIRE, sizeof(msg), &msg);
}
UCC
git Repository :: git.ucc.asn.au