From: Markus Heidelberg <markus.heidelberg@web.de>
To: Marco Costalba <mcostalba@gmail.com>
Cc: git@vger.kernel.org, Markus Heidelberg <markus.heidelberg@web.de>
Subject: [PATCH QGit 2/4] Correctly count the entries in the revs context menu
Date: Sat, 6 Jun 2009 13:57:49 +0200 [thread overview]
Message-ID: <1244289471-698-3-git-send-email-markus.heidelberg@web.de> (raw)
The previous implementation counted all the QAction entries. A separator
is of type QAction, but shouldn't be considered when calculating the
menu size.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
src/mainimpl.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp
index 60414ab..24b4ef1 100644
--- a/src/mainimpl.cpp
+++ b/src/mainimpl.cpp
@@ -1124,6 +1124,17 @@ void MainImpl::doUpdateRecentRepoMenu(SCRef newEntry) {
settings.setValue(REC_REP_KEY, newRecents);
}
+static int cntMenuEntries(const QMenu& menu) {
+
+ int cnt = 0;
+ QList<QAction*> al(menu.actions());
+ FOREACH (QList<QAction*>, it, al) {
+ if (!(*it)->isSeparator())
+ cnt++;
+ }
+ return cnt;
+}
+
void MainImpl::doContexPopup(SCRef sha) {
QMenu contextMenu(this);
@@ -1186,7 +1197,7 @@ void MainImpl::doContexPopup(SCRef sha) {
contextMenu.addSeparator();
FOREACH_SL (it, bn) {
- if (contextMenu.actions().count() < MAX_MENU_ENTRIES)
+ if (cntMenuEntries(contextMenu) < MAX_MENU_ENTRIES)
act = contextMenu.addAction(*it);
else
act = contextSubMenu.addAction(*it);
@@ -1200,7 +1211,7 @@ void MainImpl::doContexPopup(SCRef sha) {
contextMenu.addSeparator();
FOREACH_SL (it, tn) {
- if (contextMenu.actions().count() < MAX_MENU_ENTRIES)
+ if (cntMenuEntries(contextMenu) < MAX_MENU_ENTRIES)
act = contextMenu.addAction(*it);
else
act = contextSubMenu.addAction(*it);
--
1.6.3.2.213.g30b07
reply other threads:[~2009-06-06 11:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1244289471-698-3-git-send-email-markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=git@vger.kernel.org \
--cc=mcostalba@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).