lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 11:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

- harmonized win/mac menu management

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2012-08-02 06:32:43 +00:00
parent 53113faae6
commit d48fd2aaba
2 changed files with 107 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/meshlab/additionalgui.cpp
View File

@ -795,12 +795,15 @@ bool MLAutoCompleterPopUp::event( QEvent *event )
SearchMenu::SearchMenu(const WordActionsMapAccessor& wm,const int max,QWidget* parent)
:QMenu(parent),searchline(NULL),wama(wm),maxres(max)
{
searchline = new QLineEdit(this);
searchline = new MenuLineEdit(this);
QWidgetAction* searchact = new QWidgetAction(this);
searchact->setDefaultWidget(searchline);
addAction(searchact);
connect(searchline,SIGNAL(textEdited( const QString&)),this,SLOT(edited( const QString&)));
connect(searchline,SIGNAL(arrowPressed(const int)),this,SLOT(changeFocus(const int)));
connect(this,SIGNAL(aboutToShow()),this,SLOT(setLineEditFocus()));
connect(this,SIGNAL(hovered(QAction*)),this,SLOT(highlightIfEnabled(QAction*)));
setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
}
@ -867,8 +870,8 @@ void SearchMenu::updateGUI( const QList<QAction*>& results )
removeAction(todel);
}
addActions(results);
if (results.size() > 0 && (results[0] != NULL))
setActiveAction(results[0]);
//if (results.size() > 0 && (results[0] != NULL))
// setActiveAction(results[0]);
}
alignToParentGeometry();
}
@ -893,11 +896,10 @@ void SearchMenu::clearResults()
void SearchMenu::setLineEditFocus()
{
setFocus();
setFocusProxy(searchline);
searchline->setFocus();
const QList<QAction*>& acts = actions();
if (acts.size() > 1 && acts[1] != NULL)
setActiveAction(acts[1]);
//if (acts.size() > 1 && acts[1] != NULL)
// setActiveAction(acts[1]);
}
void SearchMenu::alignToParentGeometry()
@ -911,6 +913,71 @@ void SearchMenu::alignToParentGeometry()
}
}
void SearchMenu::changeFocus( const int k )
{
setFocus();
QAction* act = NULL;
int next = nextEnabledAction(k,0,actions(),act);
if (next != -1)
setActiveAction(act);
}
int SearchMenu::nextEnabledAction( const int k,const int currentind,const QList<QAction*>& acts,QAction*& nextact) const
{
const int errorind = -1;
if ((currentind < 0) || (currentind >= acts.size()))
return errorind;
QAction* current = acts[currentind];
if (acts.size() > 0)
{
if (current == NULL)
return errorind;
int ind = currentind;
do
{
if (k == Qt::Key_Up)
ind = (acts.size() + (ind - 1)) % acts.size();
else
ind = (ind + 1) % acts.size();
QAction* curract = acts[ind];
if ((curract != NULL) && (curract->isEnabled()) && !curract->isSeparator())
{
nextact = curract;
return ind;
}
} while (ind != currentind);
return errorind;
}
return errorind;
}
void SearchMenu::keyPressEvent( QKeyEvent * event )
{
int k = event->key();
if ((k != Qt::Key_Up) && (k != Qt::Key_Down))
QMenu::keyPressEvent(event);
else
{
const QList<QAction*>& acts = actions();
QAction* current = activeAction();
if (current != NULL)
{
int currentind = acts.indexOf(current);
if (currentind > -1)
{
QAction* act = NULL;
int next = nextEnabledAction(k,currentind,actions(),act);
if (next != -1)
{
if (next == 0)
searchline->setFocus();
setActiveAction(act);
}
}
}
}
}
//MyToolButton class has been introduced to overcome the "always on screen small down arrow visualization problem" officially recognized qt bug.
MyToolButton::MyToolButton( QWidget * parent /*= 0 */ ) : QToolButton( parent )
{
@ -924,3 +991,20 @@ void MyToolButton::paintEvent( QPaintEvent * )
opt.features &= (~ QStyleOptionToolButton::HasMenu);
p.drawComplexControl( QStyle::CC_ToolButton, opt );
}
MenuLineEdit::MenuLineEdit( QWidget* parent )
:QLineEdit(parent)
{
}
void MenuLineEdit::keyPressEvent( QKeyEvent * event )
{
int k = event->key();
if ((k != Qt::Key_Up) && (k != Qt::Key_Down))
QLineEdit::keyPressEvent(event);
else
emit arrowPressed(k);
}

17
src/meshlab/additionalgui.h
View File

@ -226,6 +226,17 @@ protected:
};
class MenuLineEdit : public QLineEdit
{
Q_OBJECT
public:
MenuLineEdit(QWidget* parent);
protected:
void keyPressEvent(QKeyEvent * event);
signals:
void arrowPressed(const int k);
};
class SearchMenu : public QMenu
{
Q_OBJECT
@ -234,18 +245,22 @@ public:
inline void setMaxResultNum(const int max) {maxres = max;};
inline int maxResultNum() const {return maxres;};
void clearResults();
protected:
void keyPressEvent(QKeyEvent * event);
private:
QLineEdit* searchline;
MenuLineEdit* searchline;
int maxres;
const WordActionsMapAccessor& wama;
void getResults(const QString& text,QList<QAction*>& results);
void updateGUI(const QList<QAction*>& results);
void alignToParentGeometry();
int nextEnabledAction( const int k,const int currentind,const QList<QAction*>& acts,QAction*& nextact) const;
private slots:
void edited(const QString& text);
void setLineEditFocus();
void changeFocus(const int k);
};