anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/frontends/qt4/GuiView.[Ch]:

Browse Source 
- fix false toolbar positioning for qt < 4.2.2
	- only add ToolBarBreak if the toolbar exceeds the line
	  (not perfect yet)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16927 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-01-29 14:23:05 +00:00
parent b3ced091d2
commit e36f9947cb
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/frontends/qt4/GuiView.C
View File

@ -692,29 +692,53 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarBackend::Toolbar const & tbb)
{
QLToolbar * Tb = new QLToolbar(tbb, *this);
/* NOTE:
saved toolbar position can not be restored with simple move(x,y),
Consequently, toolbars from different lines will be restore to one
line. I therefore add addToolBarBreak after each toolbar to restore
toolbars to separate lines, although toolbars in the same line can
not be restored correctly.
NOTE: qt < 4.2.2 cannot handle addToolBarBreak on non-TOP dock.
*/
if (tbb.flags & ToolbarBackend::TOP) {
addToolBar(Qt::TopToolBarArea, Tb);
addToolBarBreak(Qt::TopToolBarArea);
if (toolbarSize_.top_width > 0
&& toolbarSize_.top_width + Tb->sizeHint().width() > width()) {
insertToolBarBreak(Tb);
toolbarSize_.top_width = Tb->sizeHint().width();
} else
toolbarSize_.top_width += Tb->sizeHint().width();
}
if (tbb.flags & ToolbarBackend::BOTTOM) {
addToolBar(Qt::BottomToolBarArea, Tb);
addToolBarBreak(Qt::BottomToolBarArea);
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (toolbarSize_.bottom_width > 0
&& toolbarSize_.bottom_width + Tb->sizeHint().width() > width()) {
insertToolBarBreak(Tb);
toolbarSize_.bottom_width = Tb->sizeHint().width();
} else
toolbarSize_.bottom_width += Tb->sizeHint().width();
#endif
}
if (tbb.flags & ToolbarBackend::LEFT) {
addToolBar(Qt::LeftToolBarArea, Tb);
addToolBarBreak(Qt::LeftToolBarArea);
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (toolbarSize_.left_height > 0
&& toolbarSize_.left_height + Tb->sizeHint().height() > height()) {
insertToolBarBreak(Tb);
toolbarSize_.left_height = Tb->sizeHint().height();
} else
toolbarSize_.left_height += Tb->sizeHint().height();
#endif
}
if (tbb.flags & ToolbarBackend::RIGHT) {
addToolBar(Qt::RightToolBarArea, Tb);
addToolBarBreak(Qt::RightToolBarArea);
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (toolbarSize_.right_height > 0
&& toolbarSize_.right_height + Tb->sizeHint().height() > height()) {
insertToolBarBreak(Tb);
toolbarSize_.right_height = Tb->sizeHint().height();
} else
toolbarSize_.right_height += Tb->sizeHint().height();
#endif
}
// The following does not work so saved toolbar location can not be used.
@ -722,6 +746,7 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarBackend::Toolbar const & tbb)
ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbb.name);
Tb->move(info.posx, info.posy);
*/
return Toolbars::ToolbarPtr(Tb);
}

9
src/frontends/qt4/GuiView.h
View File

@ -144,6 +144,15 @@ private:
void setIconSize(unsigned int size);
struct ToolbarSize {
int top_width;
int bottom_width;
int left_height;
int right_height;
};
ToolbarSize toolbarSize_;
struct GuiViewPrivate;
GuiViewPrivate& d;
};