Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed issues with prior fix

Browse Source
This commit is contained in:
Samuel P. Bowman 2018-07-19 09:51:13 -04:00
parent 641612c515
commit 55a76ba7e1
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -48,11 +48,6 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>

10
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@ -51,7 +51,6 @@ import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants; import javax.swing.text.StyleConstants;
import javax.swing.text.StyledDocument; import javax.swing.text.StyledDocument;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.log4j.ConsoleAppender; import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.FileAppender; import org.apache.log4j.FileAppender;
import org.apache.log4j.Level; import org.apache.log4j.Level;
@ -153,8 +152,12 @@ public final class MainWindow implements Runnable, RipStatusHandler {
} }
private static int getAverageFontWidth(JComponent component) { private static int getAverageFontWidth(JComponent component) {
int sum = 0;
int[] widths = component.getFontMetrics(component.getFont()).getWidths(); int[] widths = component.getFontMetrics(component.getFont()).getWidths();
return Collections.max(Arrays.asList(ArrayUtils.toObject(widths))); for(int i : widths) {
sum += i;
}
return sum / widths.length;
} }
private static void insertWrappedString(JComponent parent, StyledDocument document, String string, SimpleAttributeSet s) private static void insertWrappedString(JComponent parent, StyledDocument document, String string, SimpleAttributeSet s)
@ -165,7 +168,7 @@ public final class MainWindow implements Runnable, RipStatusHandler {
while(i < string.length()/maxCharsToFit) { while(i < string.length()/maxCharsToFit) {
if(i > 0) resultString.append(string.substring(i*maxCharsToFit-2, i*maxCharsToFit)); if(i > 0) resultString.append(string.substring(i*maxCharsToFit-2, i*maxCharsToFit));
resultString.append(string.substring(i*maxCharsToFit, (i+1)*maxCharsToFit-2)); resultString.append(string.substring(i*maxCharsToFit, (i+1)*maxCharsToFit-2));
resultString.append("\\\n"); resultString.append("\n");
i++; i++;
} }
resultString.append(string.substring(string.length()-(string.length()%maxCharsToFit))); resultString.append(string.substring(string.length()-(string.length()%maxCharsToFit)));
@ -383,7 +386,6 @@ public final class MainWindow implements Runnable, RipStatusHandler {
logPanel.setBorder(emptyBorder); logPanel.setBorder(emptyBorder);
logText = new JTextPane(); logText = new JTextPane();
logText.setEditable(false); logText.setEditable(false);
logText.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
JScrollPane logTextScroll = new JScrollPane(logText); JScrollPane logTextScroll = new JScrollPane(logText);
logTextScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); logTextScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
logPanel.setVisible(false); logPanel.setVisible(false);