[Lilith-devel] SF.net SVN: lilith:[312] trunk/lilith/src/main/java/de/huxhorn/lilith/swing

[<hu...@us...>]

Revision: 312
          http://lilith.svn.sourceforge.net/lilith/?rev=312&view=rev
Author:   huxhorn
Date:     2009-08-26 23:45:17 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
Work in progress on ticket #59.

Modified Paths:
--------------
    trunk/lilith/src/main/java/de/huxhorn/lilith/swing/EventWrapperViewPanel.java
    trunk/lilith/src/main/java/de/huxhorn/lilith/swing/ViewActions.java

Modified: trunk/lilith/src/main/java/de/huxhorn/lilith/swing/EventWrapperViewPanel.java
===================================================================
--- trunk/lilith/src/main/java/de/huxhorn/lilith/swing/EventWrapperViewPanel.java	2009-08-26 00:30:44 UTC (rev 311)
+++ trunk/lilith/src/main/java/de/huxhorn/lilith/swing/EventWrapperViewPanel.java	2009-08-26 23:45:17 UTC (rev 312)
@@ -55,8 +55,8 @@
 import org.xhtmlrenderer.simple.FSScrollPane;
 import org.xhtmlrenderer.simple.extend.XhtmlNamespaceHandler;
 import org.xhtmlrenderer.swing.LinkListener;
+import org.xhtmlrenderer.swing.ScalableXHTMLPanel;
 import org.xhtmlrenderer.swing.SelectionHighlighter;
-import org.xhtmlrenderer.swing.ScalableXHTMLPanel;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -163,6 +163,7 @@
 		showingFilters = false;
 
 		tableModelListener = new StatusTableModelListener();
+		scale = mainFrame.getApplicationPreferences().getScaleFactor();
 		initUi();
 	}
 
@@ -436,7 +437,7 @@
 
 	public void setScaleFactor(double scale)
 	{
-		this.scale=scale;
+		this.scale = scale;
 		messagePane.setScale(scale);
 	}
 

Modified: trunk/lilith/src/main/java/de/huxhorn/lilith/swing/ViewActions.java
===================================================================
--- trunk/lilith/src/main/java/de/huxhorn/lilith/swing/ViewActions.java	2009-08-26 00:30:44 UTC (rev 311)
+++ trunk/lilith/src/main/java/de/huxhorn/lilith/swing/ViewActions.java	2009-08-26 23:45:17 UTC (rev 312)
@@ -1644,7 +1644,7 @@
 				EventWrapperViewPanel eventWrapperViewPanel = viewContainer.getSelectedView();
 				if(eventWrapperViewPanel != null)
 				{
-					enable=true;
+					enable = true;
 				}
 			}
 			setEnabled(enable);
@@ -1671,6 +1671,10 @@
 			ApplicationPreferences prefs = mainFrame.getApplicationPreferences();
 
 			double scale = prefs.getScaleFactor() - SCALE_FACTOR;
+			if(scale < 0.1d)
+			{
+				scale = 0.1d;
+			}
 			prefs.setScaleFactor(scale);
 		}
 
@@ -1682,7 +1686,7 @@
 				EventWrapperViewPanel eventWrapperViewPanel = viewContainer.getSelectedView();
 				if(eventWrapperViewPanel != null)
 				{
-					enable=true;
+					enable = true;
 				}
 			}
 			setEnabled(enable);
@@ -1719,7 +1723,7 @@
 				EventWrapperViewPanel eventWrapperViewPanel = viewContainer.getSelectedView();
 				if(eventWrapperViewPanel != null)
 				{
-					enable=true;
+					enable = true;
 				}
 			}
 			setEnabled(enable);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.