pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fixed bug in bitmask checking

Browse Source 
reordered groupflags  

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2206 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blaszijk
2012-01-01 20:52:34 +00:00
parent 67a2b95fac
commit 554913ea25
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/nvidia-widgets/src/nvwidgets/nvWidgets.pas
View File

@ -99,25 +99,25 @@ const
GroupFlags_LayoutHorizontal = $04;
GroupFlags_LayoutMask = $07;
GroupFlags_LayoutXMask = $ffff xor GroupFlags_LayoutMask;
GroupFlags_AlignLeft = $10;
// Alignment flags for the widgets inserted in the group
GroupFlags_AlignLeft = $10;
GroupFlags_AlignRight = $20;
GroupFlags_AlignTop = $40;
GroupFlags_AlignBottom = $80;
GroupFlags_AlignMask = $f0;
GroupFlags_AlignXMask = $ffff xor GroupFlags_AlignMask;
GroupFlags_StartLeft = $100;
// Start flags defining the starting origin of the group
GroupFlags_StartLeft = $100;
GroupFlags_StartRight = $200;
GroupFlags_StartTop = $400;
GroupFlags_StartBottom = $800;
GroupFlags_StartMask = $f00;
GroupFlags_StartXMask = $ffff xor GroupFlags_StartMask;
GroupFlags_LayoutForce = $8000;
// Optional flags
GroupFlags_LayoutForce = $8000;
GroupFlags_LayoutDefault = $4000;
GroupFlags_LayoutNoMargin = $2000;
GroupFlags_LayoutNoSpace = $1000;

6
components/nvidia-widgets/src/nvwidgets/nvglutwidgets.pas
View File

@ -144,11 +144,11 @@ begin
if button = GLUT_RIGHT_BUTTON then
button := MouseButton_Right;
if (modifier and GLUT_ACTIVE_ALT) = 1 then
if (modifier and GLUT_ACTIVE_ALT) = GLUT_ACTIVE_ALT then
modifierMask := modifierMask or (ButtonFlags_Alt);
if (modifier and GLUT_ACTIVE_SHIFT) = 1 then
if (modifier and GLUT_ACTIVE_SHIFT) = GLUT_ACTIVE_SHIFT then
modifierMask := modifierMask or (ButtonFlags_Shift);
if (modifier and GLUT_ACTIVE_CTRL) = 1 then
if (modifier and GLUT_ACTIVE_CTRL) = GLUT_ACTIVE_CTRL then
modifierMask := modifierMask or (ButtonFlags_Ctrl);
if state = GLUT_DOWN then