Ticket #3761: t3761_v3.patch

File t3761_v3.patch, 4.1 KB (added by mko, 8 years ago)

  • binaries/data/mods/public/gui/credits/texts/programming.json 

    From 66193cdd16c3cad798ae01ba28204485c9bed688 Mon Sep 17 00:00:00 2001
From: mko
Date: Tue, 28 Jun 2016 22:09:44 +0200
Subject: [PATCH] Colour label has edges slightly cut off in Match Setup, fixes
 #3761

---
 .../data/mods/public/gui/credits/texts/programming.json  |  1 +
 binaries/data/mods/public/gui/gamesetup/gamesetup.xml    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 239b39b..c45a861 100644
    a b  
    125125            {"nick": "Micnasty", "name": "Travis Gorkin"},
    126126            {"nick": "mimo"},
    127127            {"nick": "mk12", "name": "Mitchell Kember"},
     128            {"nick": "mko", "name": "Corinne Minier"},
    128129            {"nick": "Molotov", "name": "Dario Alvarez"},
    129130            {"nick": "mpmoreti", "name": "Marcos Paulo Moreti"},
    130131            {"nick": "mreiland", "name": "Michael Reiland"},

  • binaries/data/mods/public/gui/gamesetup/gamesetup.xml 

    diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index dd77378..87201ce 100644
    a b  
    4040
    4141            <!-- Player assignments -->
    4242            <object size="24 49 100%-440 345" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
    43                 <object size="0 6 100% 30">
    44                     <object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 22% 100%">
     43                <object size="0 0 100% 40">
     44                    <object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 15% 100%">
    4545                        <translatableAttribute id="caption">Player Name</translatableAttribute>
    4646                    </object>
    47                     <object name="playerColorHeading" type="text" style="ModernLabelText" size="22%+5 0 22%+40 100%">
     47                    <object name="playerColorHeading" type="text" style="ModernLabelText" size="15%+5 0 15%+55 100%">
    4848                        <translatableAttribute id="caption">Color</translatableAttribute>
    4949                    </object>
    50                     <object name="playerPlacementHeading" type="text" style="ModernLabelText" size="22%+45 0 50%+35 100%">
     50                    <object name="playerPlacementHeading" type="text" style="ModernLabelText" size="15%+60 0 50%+35 100%">
    5151                        <translatableAttribute id="caption">Player Placement</translatableAttribute>
    5252                    </object>
    5353                    <object name="playerCivHeading" type="text" style="ModernLabelText" size="50%+65 0 85%-26 100%">
    … …  
    8383                    <repeat count="8">
    8484                        <object name="playerBox[n]" size="0 0 100% 32" hidden="true">
    8585                            <object name="playerColor[n]" type="image" size="0 0 100% 100%"/>
    86                             <object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 30"/>
    87                             <object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 22%+33 30" sprite="" scrollbar="false" button_width="22" font="sans-stroke-14" tooltip_style="onscreenToolTip">
     86                            <object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 15% 30"/>
     87                            <object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="15%+5 2 15%+55 30" scrollbar="false" tooltip_style="onscreenToolTip">
    8888                                <translatableAttribute id="tooltip">Pick a color.</translatableAttribute>
    8989                            </object>
    90                             <object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 30" tooltip_style="onscreenToolTip">
     90                            <object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="15%+60 2 50%+35 30" tooltip_style="onscreenToolTip">
    9191                                <translatableAttribute id="tooltip">Select player.</translatableAttribute>
    9292                            </object>
    93                             <object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+5 0 50%+35 30"/>
     93                            <object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="15%+5 0 50%+35 30"/>
    9494                            <object name="playerConfig[n]" type="button" style="StoneButton" size="50%+40 4 50%+64 28"
    9595                                tooltip_style="onscreenToolTip"
    9696                                font="sans-bold-stroke-12"