Ticket #12085: use-noto-font.patch

File use-noto-font.patch, 3.7 KB (added by sebastic, 8 years ago)
  • data/fonts/NotoSans-Bold.ttf

    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
  • data/fonts/NotoSans-Regular.ttf

    Property changes on: data/fonts/NotoSans-Bold.ttf
    ___________________________________________________________________
    Added: svn:mime-type
    ## -0,0 +1 ##
    +application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
  • src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    Property changes on: data/fonts/NotoSans-Regular.ttf
    ___________________________________________________________________
    Added: svn:mime-type
    ## -0,0 +1 ##
    +application/octet-stream
    \ No newline at end of property
     
    14391439        showNames = paintSettings.getShowNamesDistance() > circum;
    14401440        showIcons = paintSettings.getShowIconsDistance() > circum;
    14411441        isOutlineOnly = paintSettings.isOutlineOnly();
    1442         orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
     1442        orderFont = new Font(Main.pref.get("mappaint.font", "Noto Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
    14431443
    14441444        antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
    14451445                        RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
  • src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

     
    120120            synchronized (lock) {
    121121                n = DEFAULT_FONT_NAME;
    122122                if (n == null) {
    123                     DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
     123                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Noto Sans");
    124124                }
    125125            }
    126126        }
  • src/org/openstreetmap/josm/tools/FontsManager.java

     
    2222     * List of fonts embedded into JOSM jar.
    2323     */
    2424    private static final Collection<String> INCLUDED_FONTS = Arrays.asList(
    25             "DroidSans.ttf",
    26             "DroidSans-Bold.ttf"
     25            "NotoSans-Regular.ttf",
     26            "NotoSans-Bold.ttf"
    2727    );
    2828
    2929    private FontsManager() {