Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-10-21 02:34:58 -0400
committermkersten2006-10-21 02:34:58 -0400
commit38348018e3eeda001a47813918a0d810299947cc (patch)
tree23e8b2f5385402aa77303031afee31f000596182
parent71673bdf8d02d01649123ce1e193cc3ed1016af0 (diff)
downloadorg.eclipse.mylyn.tasks-38348018e3eeda001a47813918a0d810299947cc.tar.gz
org.eclipse.mylyn.tasks-38348018e3eeda001a47813918a0d810299947cc.tar.xz
org.eclipse.mylyn.tasks-38348018e3eeda001a47813918a0d810299947cc.zip
NEW - bug 161806: long task titles cause week progress bar to stretch
https://bugs.eclipse.org/bugs/show_bug.cgi?id=161806
-rw-r--r--org.eclipse.mylyn.help.ui/doc/new.html10
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java27
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java3
3 files changed, 23 insertions, 17 deletions
diff --git a/org.eclipse.mylyn.help.ui/doc/new.html b/org.eclipse.mylyn.help.ui/doc/new.html
index 29bc40835..f86d7e1a6 100644
--- a/org.eclipse.mylyn.help.ui/doc/new.html
+++ b/org.eclipse.mylyn.help.ui/doc/new.html
@@ -1,6 +1,6 @@
<html>
<body>
-<div align=center><h1>New &amp; Noteworthy for Mylar 0.7.0</h1></div>
+<div align=center><h1>New &amp; Noteworthy for Mylar 0.8.0</h1></div>
<table border="1" style="border-collapse: collapse" width="100%" id="table128" cellpadding="4" bordercolor="#FFFFFF">
<tr>
@@ -13,6 +13,14 @@
<font color="#FFFFFF" size="1">Community Contributions</font></b></td>
</tr>
<tr>
+ <td bgcolor="#E0D0E6"><font size="1">0.8.0<br>
+ <i>Oct 20</i></font></td>
+ <td bgcolor="#E0D0E6" align="center">
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Mylar&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=2006-09-29&chfieldto=2006-10-21&chfield=resolution&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
+ <font size="1">92</font><br><font size="1">reports</font></a></td>
+ <td bgcolor="#E0D0E6"><font size="1">Eu...</font></td>
+ </tr>
+ <tr>
<td bgcolor="#E0D0E6"><font size="1">0.7.0<br>
<i>Sep 29</i></font></td>
<td bgcolor="#E0D0E6" align="center">
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java
index 901dd7c3d..c19be8899 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java
@@ -14,6 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.views;
import java.lang.reflect.Field;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.mylar.context.core.MylarStatusHandler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
@@ -40,8 +41,6 @@ public abstract class AbstractMylarFilteredTree extends FilteredTree {
private Composite progressComposite;
- private Composite parent;
-
private boolean showProgress = false;
/**
@@ -72,9 +71,15 @@ public abstract class AbstractMylarFilteredTree extends FilteredTree {
}
@Override
+ protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
+ progressComposite = createProgressComposite(parent);
+ progressComposite.setVisible(false);
+ ((GridData) progressComposite.getLayoutData()).exclude = true;
+ return super.doCreateTreeViewer(parent, style);
+ }
+
+ @Override
protected Composite createFilterControls(Composite parent) {
- this.parent = parent;
-
GridLayout gridLayout = new GridLayout(4, false);
gridLayout.marginWidth = 2;
gridLayout.marginHeight = 2;
@@ -100,10 +105,9 @@ public abstract class AbstractMylarFilteredTree extends FilteredTree {
});
createStatusComposite(parent);
-// createProgressComposite(parent);
return parent;
}
-
+
protected abstract Composite createProgressComposite(Composite container);
protected abstract Composite createStatusComposite(Composite container);
@@ -128,15 +132,8 @@ public abstract class AbstractMylarFilteredTree extends FilteredTree {
public void setShowProgress(boolean showProgress) {
this.showProgress = showProgress;
-// filterComposite
- if (!showProgress && progressComposite != null) {
- progressComposite.dispose();
- } else {
- progressComposite = createProgressComposite(parent);
- }
+ progressComposite.setVisible(showProgress);
+ ((GridData) progressComposite.getLayoutData()).exclude = !showProgress;
layout();
-// progressComposite.setVisible(showProgress);
-// filterComposite.layout();
-// filterComposite.pack();
}
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
index 816dede29..53e76cc54 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
@@ -49,8 +49,9 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
protected Composite createProgressComposite(Composite container) {
Composite progressComposite = new Composite(container, SWT.NONE);
GridLayout progressLayout = new GridLayout(1, false);
- progressLayout.marginWidth = 0;
+ progressLayout.marginWidth = 2;
progressLayout.marginHeight = 0;
+ progressLayout.marginBottom = 2;
progressLayout.horizontalSpacing = 0;
progressLayout.verticalSpacing = 0;
progressComposite.setLayout(progressLayout);

Back to the top