diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-11-10 18:35:37 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-11-10 18:35:37 +0100 |
| commit | e8f2eeac9221d91ba32447bbcbdc5ba057647f8e (patch) | |
| tree | fc73ad96a3f3c60c6c2422a2966840ee02b2f2a0 /gtk/gtkbitmaskprivateimpl.h | |
| parent | aae2bf91cb0b092529fea7efe1d9884f9168e5aa (diff) | |
| download | gtk+-e8f2eeac9221d91ba32447bbcbdc5ba057647f8e.tar.gz | |
bitmask: Fix intersection code
With the fix in 77912a65e2aa6eb9cfee994fa93bbfbc6b9f8538, another bug
got visible: booleans are 32 bits, so if the intersection between the 2
bitmasks happened in higher bits, the return value would be truncated to
FALSE.
This actually made slider handles disappear, so it was pretty visible.
Diffstat (limited to 'gtk/gtkbitmaskprivateimpl.h')
| -rw-r--r-- | gtk/gtkbitmaskprivateimpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h index c46fa9622c..c0058c77da 100644 --- a/gtk/gtkbitmaskprivateimpl.h +++ b/gtk/gtkbitmaskprivateimpl.h @@ -163,5 +163,5 @@ _gtk_bitmask_intersects (const GtkBitmask *mask, _gtk_bitmask_is_allocated (other)) return _gtk_allocated_bitmask_intersects (mask, other); else - return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other); + return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other) ? TRUE : FALSE; } |