equal
deleted
inserted
replaced
88 int bit = -1; |
88 int bit = -1; |
89 switch (att) { |
89 switch (att) { |
90 // Does not overlap with values set in attributeToBitIndex(Qt::WidgetAttribute) |
90 // Does not overlap with values set in attributeToBitIndex(Qt::WidgetAttribute) |
91 case Hb::InteractionDisabled: bit = 1; break; |
91 case Hb::InteractionDisabled: bit = 1; break; |
92 case Hb::InsidePopup: bit = 2; break; |
92 case Hb::InsidePopup: bit = 2; break; |
93 case Hb::InputMethodNeutral: bit = 3; break; |
93 case Hb::Widget: bit = 3; break; |
94 case Hb::Widget: bit = 4; break; |
|
95 default: break; |
94 default: break; |
96 } |
95 } |
97 return bit; |
96 return bit; |
|
97 } |
|
98 |
|
99 /* |
|
100 In case when \a newAlign has no set vertical or horizontal part, |
|
101 missing part is replaced with respective part of \a oldAlign. |
|
102 */ |
|
103 static inline Qt::Alignment combineAlignment (Qt::Alignment newAlign, Qt::Alignment oldAlign) |
|
104 { |
|
105 newAlign &= Qt::AlignVertical_Mask | Qt::AlignHorizontal_Mask; |
|
106 if ((newAlign & Qt::AlignHorizontal_Mask) == 0) { |
|
107 newAlign |= oldAlign & Qt::AlignHorizontal_Mask; |
|
108 } |
|
109 if ((newAlign & Qt::AlignVertical_Mask) == 0) { |
|
110 newAlign |= oldAlign & Qt::AlignVertical_Mask; |
|
111 } |
|
112 return newAlign; |
98 } |
113 } |
99 |
114 |
100 quint32 mApiProtectionFlags; |
115 quint32 mApiProtectionFlags; |
101 quint32 attributes : 5; |
116 quint32 attributes : 5; |
102 HbFontSpec fontSpec; |
117 HbFontSpec fontSpec; |