Commit 2995dcc0 authored by Matyáš Latner's avatar Matyáš Latner

Merge branch 'feature-encyclopedia-devel' into 'devel'

#201 Default fonts increased. Minor changes.



See merge request !260
parents 14e60487 fa9d2584
......@@ -6,13 +6,13 @@ import cz.nic.tablexia.loader.application.ApplicationFontManager;
* Created by vitaliy on 23.12.15.
*/
public enum EncyclopediaFont {
SMALL_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_16),
DEFAULT_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_18),
LARGE_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_20),
SMALL_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_18),
DEFAULT_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_20),
LARGE_REGULAR(ApplicationFontManager.FontType_NEW.REGULAR_26),
SMALL_BOLD(ApplicationFontManager.FontType_NEW.BOLD_16),
DEFAULT_BOLD(ApplicationFontManager.FontType_NEW.BOLD_18),
LARGE_BOLD(ApplicationFontManager.FontType_NEW.BOLD_20),
SMALL_BOLD(ApplicationFontManager.FontType_NEW.BOLD_18),
DEFAULT_BOLD(ApplicationFontManager.FontType_NEW.BOLD_20),
LARGE_BOLD(ApplicationFontManager.FontType_NEW.BOLD_26),
SMALL_HEADER(ApplicationFontManager.FontType_NEW.BOLD_20),
DEFAULT_HEADER(ApplicationFontManager.FontType_NEW.BOLD_26),
......@@ -30,51 +30,16 @@ public enum EncyclopediaFont {
public EncyclopediaFont getSmaller() {
int index = ordinal();
switch (ordinal()) {
case 1:
index = 0;
break;
case 2:
index = 1;
break;
case 4:
index = 3;
break;
case 5:
index=4;
break;
case 7:
index = 6;
break;
case 8:
index =7;
break;
if (index!=0&&index!=3 && index!=6){
index--;
}
return values()[index];
}
public EncyclopediaFont getLarger(){
int index = ordinal();
switch (ordinal()){
case 0:
index = 1;
break;
case 1:
index =2;
break;
case 3:
index = 4;
break;
case 4:
index=5;
break;
case 6:
index =7;
break;
case 7:
index = 8;
break;
if (index!=2&&index!=5&&index!=8){
index++;
}
return values()[index];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment