Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/b5a9d6469eb82f72a449a35f53d72764bab99ff7?style=unified&whitespace=ignore-change
You should set ROOT_URL correctly, otherwise the web may not work correctly.
3 changed files with
23 additions and
1 deletions
src/board/UBBoardPaletteManager.cpp
src/gui/UBDockPalette.cpp
src/gui/UBDockPalette.h
@ -743,6 +743,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mLeftPalette - > setVisible ( true ) ;
mRightPalette - > setVisible ( true ) ;
# ifdef Q_WS_WIN
mRightPalette - > setAdditionalVOffset ( 0 ) ;
# endif
if ( ! isInit )
containerResized ( ) ;
@ -772,6 +775,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mLeftPalette - > setVisible ( false ) ;
mRightPalette - > setVisible ( true ) ;
# ifdef Q_WS_WIN
mRightPalette - > setAdditionalVOffset ( 30 ) ;
# endif
if ( ! isInit )
UBApplication : : applicationController - > uninotesController ( ) - > TransparentWidgetResized ( ) ;
@ -688,7 +688,7 @@ void UBDockPalette::moveTabs()
}
}
QPoint origin ( width ( ) , mHTab ) ;
QPoint origin ( width ( ) , mHTab + mTabPalette - > mVerticalOffset ) ;
switch ( mOrientation ) {
case eUBDockOrientation_Left :
@ -732,6 +732,8 @@ void UBDockPalette::setVisible(bool visible)
UBTabDockPalete : : UBTabDockPalete ( UBDockPalette * dockPalette , QWidget * parent ) :
QWidget ( parent )
, dock ( dockPalette )
, mVerticalOffset ( 0 )
, mFlotable ( false )
{
int numTabs = dock - > mTabWidgets . size ( ) ;
resize ( 2 * dock - > border ( ) , ( numTabs * TABSIZE ) + qMax ( numTabs - 1 , 0 ) * dock - > tabSpacing ( ) ) ;
@ -846,6 +848,12 @@ void UBTabDockPalete::mouseMoveEvent(QMouseEvent *event)
if ( dock - > mCanResize & & ( ( dock - > mMousePressPos - p ) . manhattanLength ( ) > QApplication : : startDragDistance ( ) ) )
{
if ( qAbs ( dock - > mMousePressPos . y ( ) - p . y ( ) ) > 10 & & mFlotable ) {
qDebug ( ) < < " y differences " < < dock - > mMousePressPos . y ( ) < < p . y ( ) ;
mVerticalOffset + = p . y ( ) - dock - > mMousePressPos . y ( ) ;
move ( this - > pos ( ) . x ( ) , p . y ( ) ) ;
}
switch ( dock - > mOrientation ) {
case eUBDockOrientation_Left :
@ -71,6 +71,8 @@ protected:
private :
UBDockPalette * dock ;
int mVerticalOffset ;
bool mFlotable ;
} ;
class UBDockPalette : public QWidget
@ -107,6 +109,12 @@ public:
QVector < UBDockPaletteWidget * > GetWidgetsList ( ) { return mRegisteredWidgets ; }
public :
bool isTabFlotable ( ) { return mTabPalette - > mFlotable ; }
void setTabFlotable ( bool newFlotable ) { mTabPalette - > mFlotable = newFlotable ; }
int getAdditionalVOffset ( ) const { return mTabPalette - > mVerticalOffset ; }
void setAdditionalVOffset ( int newOffset ) { mTabPalette - > mVerticalOffset = newOffset ; }
public slots :
void onShowTabWidget ( const QString & widgetName ) ;
void onHideTabWidget ( const QString & widgetName ) ;