@ -66,17 +66,17 @@ UBStylusPalette::UBStylusPalette(QWidget *parent, Qt::Orientation orient)
if ( ! UBPlatformUtils : : hasVirtualKeyboard ( ) )
if ( ! UBPlatformUtils : : hasVirtualKeyboard ( ) )
{
{
groupActions ( ) ;
groupActions ( ) ;
}
}
else
else
{
{
// VirtualKeyboard action is not in group
// VirtualKeyboard action is not in group
// So, groupping all buttons, except last
// So, groupping all buttons, except last
mButtonGroup = new QButtonGroup ( this ) ;
mButtonGroup = new QButtonGroup ( this ) ;
for ( int i = 0 ; i < mButtons . size ( ) - 1 ; i + + )
for ( int i = 0 ; i < mButtons . size ( ) - 1 ; i + + )
{
{
mButtonGroup - > addButton ( mButtons [ i ] , i ) ;
mButtonGroup - > addButton ( mButtons [ i ] , i ) ;
}
}
connect ( mButtonGroup , SIGNAL ( buttonClicked ( int ) ) , this , SIGNAL ( buttonGroupClicked ( int ) ) ) ;
connect ( mButtonGroup , SIGNAL ( buttonClicked ( int ) ) , this , SIGNAL ( buttonGroupClicked ( int ) ) ) ;
}
}
@ -93,23 +93,28 @@ UBStylusPalette::UBStylusPalette(QWidget *parent, Qt::Orientation orient)
void UBStylusPalette : : initPosition ( )
void UBStylusPalette : : initPosition ( )
{
{
if ( ! UBSettings : : settings ( ) - > appToolBarOrientationVertical - > get ( ) . toBool ( ) )
QWidget * pParentW = parentWidget ( ) ;
{
if ( ! pParentW ) return ;
QWidget * pParentW = parentWidget ( ) ;
if ( NULL ! = pParentW )
mCustomPosition = true ;
{
mCustomPosition = true ;
QPoint pos ;
QPoint pos ;
int parentWidth = pParentW - > width ( ) ;
int parentWidth = pParentW - > width ( ) ;
int parentHeight = pParentW - > height ( ) ;
int parentHeight = pParentW - > height ( ) ;
int posX = ( parentWidth / 2 ) - ( width ( ) / 2 ) ;
if ( UBSettings : : settings ( ) - > appToolBarOrientationVertical - > get ( ) . toBool ( ) ) {
int posY = parentHeight - border ( ) - height ( ) ;
int posX = border ( ) ;
int posY = ( parentHeight / 2 ) - ( height ( ) / 2 ) ;
pos . setX ( posX ) ;
pos . setX ( posX ) ;
pos . setY ( posY ) ;
pos . setY ( posY ) ;
moveInsideParent ( pos ) ;
}
}
else {
int posX = ( parentWidth / 2 ) - ( width ( ) / 2 ) ;
int posY = parentHeight - border ( ) - height ( ) ;
pos . setX ( posX ) ;
pos . setY ( posY ) ;
}
}
moveInsideParent ( pos ) ;
}
}
UBStylusPalette : : ~ UBStylusPalette ( )
UBStylusPalette : : ~ UBStylusPalette ( )