From 9e63b394adc8f3f9fa8da369d21c459d54cbaf37 Mon Sep 17 00:00:00 2001 From: Kenny Shields Date: Wed, 26 Dec 2012 07:45:33 -0500 Subject: [PATCH] Version 0.9.4.9 - Alpha (see changelog.txt) --- changelog.txt | 10 + debug.lua | 20 +- init.lua | 28 +- license.txt | 711 +++----- objects/base.lua | 2 +- ...mnlist-listarea.lua => columnlistarea.lua} | 0 .../{columnlist-row.lua => columnlistrow.lua} | 0 ...mnlist-header.lua => coulmnlistheader.lua} | 0 ...ltichoice-list.lua => multichoicelist.lua} | 4 +- ...multichoice-row.lua => multichoicerow.lua} | 2 +- readme.md | 8 +- skins.lua | 11 + skins/Blue (basic)/images/arrow-down.png | Bin 0 -> 180 bytes skins/Blue (basic)/images/arrow-left.png | Bin 0 -> 188 bytes skins/Blue (basic)/images/arrow-right.png | Bin 0 -> 185 bytes skins/Blue (basic)/images/arrow-up.png | Bin 0 -> 188 bytes skins/Blue (basic)/images/close.png | Bin 0 -> 252 bytes .../Blue (basic)/images/multichoice-arrow.png | Bin 0 -> 231 bytes skins/Blue (basic)/skin.lua | 1505 +++++++++++++++++ skins/Blue/skin.lua | 772 ++++----- skins/Orange (basic)/images/arrow-down.png | Bin 0 -> 180 bytes skins/Orange (basic)/images/arrow-left.png | Bin 0 -> 188 bytes skins/Orange (basic)/images/arrow-right.png | Bin 0 -> 185 bytes skins/Orange (basic)/images/arrow-up.png | Bin 0 -> 188 bytes skins/Orange (basic)/images/close.png | Bin 0 -> 252 bytes .../images/multichoice-arrow.png | Bin 0 -> 231 bytes skins/Orange (basic)/skin.lua | 1505 +++++++++++++++++ skins/Orange/skin.lua | 783 +++++---- 28 files changed, 4037 insertions(+), 1324 deletions(-) rename objects/internal/columnlist/{columnlist-listarea.lua => columnlistarea.lua} (100%) rename objects/internal/columnlist/{columnlist-row.lua => columnlistrow.lua} (100%) rename objects/internal/columnlist/{coulmnlist-header.lua => coulmnlistheader.lua} (100%) rename objects/internal/multichoice/{multichoice-list.lua => multichoicelist.lua} (99%) rename objects/internal/multichoice/{multichoice-row.lua => multichoicerow.lua} (99%) create mode 100644 skins/Blue (basic)/images/arrow-down.png create mode 100644 skins/Blue (basic)/images/arrow-left.png create mode 100644 skins/Blue (basic)/images/arrow-right.png create mode 100644 skins/Blue (basic)/images/arrow-up.png create mode 100644 skins/Blue (basic)/images/close.png create mode 100644 skins/Blue (basic)/images/multichoice-arrow.png create mode 100644 skins/Blue (basic)/skin.lua create mode 100644 skins/Orange (basic)/images/arrow-down.png create mode 100644 skins/Orange (basic)/images/arrow-left.png create mode 100644 skins/Orange (basic)/images/arrow-right.png create mode 100644 skins/Orange (basic)/images/arrow-up.png create mode 100644 skins/Orange (basic)/images/close.png create mode 100644 skins/Orange (basic)/images/multichoice-arrow.png create mode 100644 skins/Orange (basic)/skin.lua diff --git a/changelog.txt b/changelog.txt index bcd2d95..f96747f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +================================================ +Version 0.9.4.9 - Alpha (December 26 - 2012) +================================================ +[ADDED] a new default skin: Blue (basic) +[ADDED] a new default skin: Orange (basic) +[ADDED] a new skins library function: loveframes.skins.GetAvailalbe() + +[CHANGED] the license from CC BY-SA 3.0 to CC BY 3.0 +[CHANGED] made minor improvements to the default skins + ================================================ Version 0.9.4.8 - Alpha (December 24 - 2012) ================================================ diff --git a/debug.lua b/debug.lua index 085ad9f..e350550 100644 --- a/debug.lua +++ b/debug.lua @@ -6,7 +6,7 @@ -- debug library loveframes.debug = {} -local font = loveframes.basicfontsmall +local font = loveframes.basicfontsmall local centerarea = {210, 5, 585, 590} local loremipsum = [[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet massa mattis tortor faucibus non congue mauris mattis. Aliquam ultricies scelerisque mi, sit amet tempor metus pharetra vel. Etiam eu arcu a dolor porttitor condimentum in malesuada urna. Mauris vel nulla mi, quis aliquet neque. In aliquet turpis eget purus malesuada tincidunt. Donec rutrum purus vel diam suscipit vehicula. Cras sem nibh, tempus at dictum non, consequat non justo. In sed tellus nec orci scelerisque scelerisque id vitae leo. Maecenas pharetra, nibh eget commodo gravida, augue nisl blandit dui, ut malesuada augue dui nec erat. Phasellus nec mauris pharetra metus iaculis viverra sit amet ut tortor. Duis et viverra magna. Nunc orci dolor, placerat a iaculis non, mattis sed nibh. @@ -34,16 +34,16 @@ function loveframes.debug.draw() return end - local cols = loveframes.util.GetCollisions() - local topcol = {type = none, children = {}, x = 0, y = 0, width = 0, height = 0} - local objects = loveframes.util.GetAllObjects() - local author = loveframes.info.author - local version = loveframes.info.version - local stage = loveframes.info.stage - local basedir = loveframes.config["DIRECTORY"] + local cols = loveframes.util.GetCollisions() + local topcol = {type = none, children = {}, x = 0, y = 0, width = 0, height = 0} + local objects = loveframes.util.GetAllObjects() + local author = loveframes.info.author + local version = loveframes.info.version + local stage = loveframes.info.stage + local basedir = loveframes.config["DIRECTORY"] local loveversion = love._version - local fps = love.timer.getFPS() - local deltatime = love.timer.getDelta() + local fps = love.timer.getFPS() + local deltatime = love.timer.getDelta() -- set the top most collision object for k, v in ipairs(cols) do diff --git a/init.lua b/init.lua index 52cc908..3b5563d 100644 --- a/init.lua +++ b/init.lua @@ -9,7 +9,7 @@ loveframes = {} -- library info loveframes.info = {} loveframes.info.author = "Kenny Shields" -loveframes.info.version = "0.9.4.8" +loveframes.info.version = "0.9.4.9" loveframes.info.stage = "Alpha" -- library configurations @@ -50,8 +50,8 @@ function loveframes.load() loveframes.config["DIRECTORY"] = dir -- create a list of gui objects, skins and templates - local objects = loveframes.util.GetDirectoryContents(dir .. "/objects") - local skins = loveframes.util.GetDirectoryContents(dir .. "/skins") + local objects = loveframes.util.GetDirectoryContents(dir .. "/objects") + local skins = loveframes.util.GetDirectoryContents(dir .. "/skins") local templates = loveframes.util.GetDirectoryContents(dir .. "/templates") -- loop through a list of all gui objects and require them @@ -88,7 +88,6 @@ end function loveframes.update(dt) local base = loveframes.base - base:update(dt) end @@ -100,14 +99,9 @@ end function loveframes.draw() local base = loveframes.base - - -- set the drawcount to zero - loveframes.drawcount = 0 - - -- draw the base object base:draw() - -- draw the debug library + loveframes.drawcount = 0 loveframes.debug.draw() end @@ -119,7 +113,6 @@ end function loveframes.mousepressed(x, y, button) local base = loveframes.base - base:mousepressed(x, y, button) end @@ -131,7 +124,6 @@ end function loveframes.mousereleased(x, y, button) local base = loveframes.base - base:mousereleased(x, y, button) -- reset the hover object @@ -149,7 +141,6 @@ end function loveframes.keypressed(key, unicode) local base = loveframes.base - base:keypressed(key, unicode) end @@ -161,7 +152,6 @@ end function loveframes.keyreleased(key) local base = loveframes.base - base:keyreleased(key) end @@ -177,7 +167,7 @@ function loveframes.Create(data, parent) if type(data) == "string" then local objects = loveframes.objects - local object = objects[data] + local object = objects[data] if not object then loveframes.util.Error("Error creating object: Invalid object '" ..data.. "'.") @@ -285,14 +275,14 @@ end function loveframes.NewObject(id, name, inherit_from_base) local objects = loveframes.objects - local object = false + local object = false if inherit_from_base then - local base = objects["base"] - object = class(name, base) + local base = objects["base"] + object = class(name, base) objects[id] = object else - object = class(name) + object = class(name) objects[id] = object end diff --git a/license.txt b/license.txt index 666c2a1..33c7e27 100644 --- a/license.txt +++ b/license.txt @@ -1,484 +1,227 @@ -Löve Frames is licensed under the Creative -Commons Attribution-ShareAlike 3.0 Unported (CC -BY-SA 3.0) license. Below is the entire legal code -for the license. For more information on this -license, please visit this web page: -http://creativecommons.org/licenses/by-sa/3.0/ - -License - -THE WORK (AS DEFINED BELOW) IS -PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS -PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK -IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE -LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED -UNDER THIS LICENSE OR COPYRIGHT LAW IS -PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE -WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE -BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT -THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, -THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE -IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS -AND CONDITIONS. - -1. Definitions - - -"Adaptation" means a work based upon the Work, -or upon the Work and other pre-existing works, -such as a translation, adaptation, derivative -work, arrangement of music or other alterations of -a literary or artistic work, or phonogram or -performance and includes cinematographic -adaptations or any other form in which the Work -may be recast, transformed, or adapted including -in any form recognizably derived from the -original, except that a work that constitutes a -Collection will not be considered an Adaptation -for the purpose of this License. For the avoidance -of doubt, where the Work is a musical work, -performance or phonogram, the synchronization of -the Work in timed-relation with a moving image -("synching") will be considered an Adaptation -for the purpose of this License. - -"Collection" means a collection of literary or -artistic works, such as encyclopedias and -anthologies, or performances, phonograms or -broadcasts, or other works or subject matter other -than works listed in Section 1(f) below, which, by -reason of the selection and arrangement of their -contents, constitute intellectual creations, in -which the Work is included in its entirety in -unmodified form along with one or more other -contributions, each constituting separate and -independent works in themselves, which together -are assembled into a collective whole. A work that -constitutes a Collection will not be considered an -Adaptation (as defined below) for the purposes of -this License. - "Creative Commons Compatible -License" means a license that is listed at -http://creativecommons.org/compatiblelicenses that -has been approved by Creative Commons as being -essentially equivalent to this License, including, -at a minimum, because that license: (i) contains -terms that have the same purpose, meaning and -effect as the License Elements of this License; -and, (ii) explicitly permits the relicensing of -adaptations of works made available under that -license under this License or a Creative Commons -jurisdiction license with the same License -Elements as this License. - "Distribute" -means to make available to the public the original -and copies of the Work or Adaptation, as -appropriate, through sale or other transfer of -ownership. - "License Elements" means the -following high-level license attributes as -selected by Licensor and indicated in the title of -this License: Attribution, ShareAlike. - -"Licensor" means the individual, individuals, -entity or entities that offer(s) the Work under -the terms of this License. - "Original -Author" means, in the case of a literary or -artistic work, the individual, individuals, entity -or entities who created the Work or if no -individual or entity can be identified, the -publisher; and in addition (i) in the case of a -performance the actors, singers, musicians, -dancers, and other persons who act, sing, deliver, -declaim, play in, interpret or otherwise perform -literary or artistic works or expressions of -folklore; (ii) in the case of a phonogram the -producer being the person or legal entity who -first fixes the sounds of a performance or other -sounds; and, (iii) in the case of broadcasts, the -organization that transmits the broadcast. - -"Work" means the literary and/or artistic work -offered under the terms of this License including -without limitation any production in the literary, -scientific and artistic domain, whatever may be -the mode or form of its expression including -digital form, such as a book, pamphlet and other -writing; a lecture, address, sermon or other work -of the same nature; a dramatic or -dramatico-musical work; a choreographic work or -entertainment in dumb show; a musical composition -with or without words; a cinematographic work to -which are assimilated works expressed by a process -analogous to cinematography; a work of drawing, -painting, architecture, sculpture, engraving or -lithography; a photographic work to which are -assimilated works expressed by a process analogous -to photography; a work of applied art; an -illustration, map, plan, sketch or -three-dimensional work relative to geography, -topography, architecture or science; a -performance; a broadcast; a phonogram; a -compilation of data to the extent it is protected -as a copyrightable work; or a work performed by a -variety or circus performer to the extent it is -not otherwise considered a literary or artistic -work. - "You" means an individual or entity -exercising rights under this License who has not -previously violated the terms of this License with -respect to the Work, or who has received express -permission from the Licensor to exercise rights -under this License despite a previous violation. - - "Publicly Perform" means to perform public -recitations of the Work and to communicate to the -public those public recitations, by any means or -process, including by wire or wireless means or -public digital performances; to make available to -the public Works in such a way that members of the -public may access these Works from a place and at -a place individually chosen by them; to perform -the Work to the public by any means or process and -the communication to the public of the -performances of the Work, including by public -digital performance; to broadcast and rebroadcast -the Work by any means including signs, sounds or -images. - "Reproduce" means to make copies of -the Work by any means including without limitation -by sound or visual recordings and the right of -fixation and reproducing fixations of the Work, -including storage of a protected performance or -phonogram in digital form or other electronic -medium. - -2. Fair Dealing Rights. Nothing in this -License is intended to reduce, limit, or restrict -any uses free from copyright or rights arising -from limitations or exceptions that are provided -for in connection with the copyright protection -under copyright law or other applicable -laws. - -3. License Grant. Subject to the terms -and conditions of this License, Licensor hereby -grants You a worldwide, royalty-free, -non-exclusive, perpetual (for the duration of the -applicable copyright) license to exercise the -rights in the Work as stated below: - - to -Reproduce the Work, to incorporate the Work into -one or more Collections, and to Reproduce the Work -as incorporated in the Collections; - to create -and Reproduce Adaptations provided that any such -Adaptation, including any translation in any -medium, takes reasonable steps to clearly label, -demarcate or otherwise identify that changes were -made to the original Work. For example, a -translation could be marked "The original work -was translated from English to Spanish," or a -modification could indicate "The original work -has been modified."; - to Distribute and -Publicly Perform the Work including as -incorporated in Collections; and, - to -Distribute and Publicly Perform Adaptations. - - - For the avoidance of doubt: - Non-waivable -Compulsory License Schemes. In those jurisdictions -in which the right to collect royalties through -any statutory or compulsory licensing scheme -cannot be waived, the Licensor reserves the -exclusive right to collect such royalties for any -exercise by You of the rights granted under this -License; - Waivable Compulsory License -Schemes. In those jurisdictions in which the right -to collect royalties through any statutory or -compulsory licensing scheme can be waived, the -Licensor waives the exclusive right to collect -such royalties for any exercise by You of the -rights granted under this License; and, - -Voluntary License Schemes. The Licensor waives the -right to collect royalties, whether individually -or, in the event that the Licensor is a member of -a collecting society that administers voluntary -licensing schemes, via that society, from any -exercise by You of the rights granted under this -License. - -The above rights may be exercised in -all media and formats whether now known or -hereafter devised. The above rights include the -right to make such modifications as are -technically necessary to exercise the rights in -other media and formats. Subject to Section 8(f), -all rights not expressly granted by Licensor are -hereby reserved. - -4. Restrictions. The license -granted in Section 3 above is expressly made -subject to and limited by the following -restrictions: - - You may Distribute or -Publicly Perform the Work only under the terms of -this License. You must include a copy of, or the -Uniform Resource Identifier (URI) for, this -License with every copy of the Work You Distribute -or Publicly Perform. You may not offer or impose -any terms on the Work that restrict the terms of -this License or the ability of the recipient of -the Work to exercise the rights granted to that -recipient under the terms of the License. You may -not sublicense the Work. You must keep intact all -notices that refer to this License and to the -disclaimer of warranties with every copy of the -Work You Distribute or Publicly Perform. When You -Distribute or Publicly Perform the Work, You may -not impose any effective technological measures on -the Work that restrict the ability of a recipient -of the Work from You to exercise the rights -granted to that recipient under the terms of the -License. This Section 4(a) applies to the Work as -incorporated in a Collection, but this does not -require the Collection apart from the Work itself -to be made subject to the terms of this License. -If You create a Collection, upon notice from any -Licensor You must, to the extent practicable, -remove from the Collection any credit as required -by Section 4(c), as requested. If You create an -Adaptation, upon notice from any Licensor You -must, to the extent practicable, remove from the -Adaptation any credit as required by Section 4(c), -as requested. - You may Distribute or Publicly -Perform an Adaptation only under the terms of: (i) -this License; (ii) a later version of this License -with the same License Elements as this License; -(iii) a Creative Commons jurisdiction license -(either this or a later license version) that -contains the same License Elements as this License -(e.g., Attribution-ShareAlike 3.0 US)); (iv) a -Creative Commons Compatible License. If you -license the Adaptation under one of the licenses -mentioned in (iv), you must comply with the terms -of that license. If you license the Adaptation -under the terms of any of the licenses mentioned -in (i), (ii) or (iii) (the "Applicable -License"), you must comply with the terms of the -Applicable License generally and the following -provisions: (I) You must include a copy of, or the -URI for, the Applicable License with every copy of -each Adaptation You Distribute or Publicly -Perform; (II) You may not offer or impose any -terms on the Adaptation that restrict the terms of -the Applicable License or the ability of the -recipient of the Adaptation to exercise the rights -granted to that recipient under the terms of the -Applicable License; (III) You must keep intact all -notices that refer to the Applicable License and -to the disclaimer of warranties with every copy of -the Work as included in the Adaptation You -Distribute or Publicly Perform; (IV) when You -Distribute or Publicly Perform the Adaptation, You -may not impose any effective technological -measures on the Adaptation that restrict the -ability of a recipient of the Adaptation from You -to exercise the rights granted to that recipient -under the terms of the Applicable License. This -Section 4(b) applies to the Adaptation as -incorporated in a Collection, but this does not -require the Collection apart from the Adaptation -itself to be made subject to the terms of the -Applicable License. - If You Distribute, or -Publicly Perform the Work or any Adaptations or -Collections, You must, unless a request has been -made pursuant to Section 4(a), keep intact all -copyright notices for the Work and provide, -reasonable to the medium or means You are -utilizing: (i) the name of the Original Author (or -pseudonym, if applicable) if supplied, and/or if -the Original Author and/or Licensor designate -another party or parties (e.g., a sponsor -institute, publishing entity, journal) for -attribution ("Attribution Parties") in -Licensor's copyright notice, terms of service or -by other reasonable means, the name of such party -or parties; (ii) the title of the Work if -supplied; (iii) to the extent reasonably -practicable, the URI, if any, that Licensor -specifies to be associated with the Work, unless -such URI does not refer to the copyright notice or -licensing information for the Work; and (iv) , -consistent with Ssection 3(b), in the case of an -Adaptation, a credit identifying the use of the -Work in the Adaptation (e.g., "French translation -of the Work by Original Author," or "Screenplay -based on original Work by Original Author"). The -credit required by this Section 4(c) may be -implemented in any reasonable manner; provided, -however, that in the case of a Adaptation or -Collection, at a minimum such credit will appear, -if a credit for all contributing authors of the -Adaptation or Collection appears, then as part of -these credits and in a manner at least as -prominent as the credits for the other -contributing authors. For the avoidance of doubt, -You may only use the credit required by this -Section for the purpose of attribution in the -manner set out above and, by exercising Your -rights under this License, You may not implicitly -or explicitly assert or imply any connection with, -sponsorship or endorsement by the Original Author, -Licensor and/or Attribution Parties, as -appropriate, of You or Your use of the Work, -without the separate, express prior written -permission of the Original Author, Licensor and/or -Attribution Parties. - Except as otherwise -agreed in writing by the Licensor or as may be -otherwise permitted by applicable law, if You -Reproduce, Distribute or Publicly Perform the Work -either by itself or as part of any Adaptations or -Collections, You must not distort, mutilate, -modify or take other derogatory action in relation -to the Work which would be prejudicial to the -Original Author's honor or reputation. Licensor -agrees that in those jurisdictions (e.g. Japan), -in which any exercise of the right granted in -Section 3(b) of this License (the right to make -Adaptations) would be deemed to be a distortion, -mutilation, modification or other derogatory -action prejudicial to the Original Author's honor -and reputation, the Licensor will waive or not -assert, as appropriate, this Section, to the -fullest extent permitted by the applicable -national law, to enable You to reasonably exercise -Your right under Section 3(b) of this License -(right to make Adaptations) but not -otherwise. - -5. Representations, Warranties and -Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO -BY THE PARTIES IN WRITING, LICENSOR OFFERS THE -WORK AS-IS AND MAKES NO REPRESENTATIONS OR -WARRANTIES OF ANY KIND CONCERNING THE WORK, -EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, -INCLUDING, WITHOUT LIMITATION, WARRANTIES OF -TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR -PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT -OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF -ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. -SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF -IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT -APPLY TO YOU. - -6. Limitation on Liability. -EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, -IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY -LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, -CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES -ARISING OUT OF THIS LICENSE OR THE USE OF THE -WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - - This License and the rights granted hereunder -will terminate automatically upon any breach by -You of the terms of this License. Individuals or -entities who have received Adaptations or -Collections from You under this License, however, -will not have their licenses terminated provided -such individuals or entities remain in full -compliance with those licenses. Sections 1, 2, 5, -6, 7, and 8 will survive any termination of this -License. - Subject to the above terms and -conditions, the license granted here is perpetual -(for the duration of the applicable copyright in -the Work). Notwithstanding the above, Licensor -reserves the right to release the Work under -different license terms or to stop distributing -the Work at any time; provided, however that any -such election will not serve to withdraw this -License (or any other license that has been, or is -required to be, granted under the terms of this -License), and this License will continue in full -force and effect unless terminated as stated -above. - -8. Miscellaneous - - Each time You -Distribute or Publicly Perform the Work or a -Collection, the Licensor offers to the recipient a -license to the Work on the same terms and -conditions as the license granted to You under -this License. - Each time You Distribute or -Publicly Perform an Adaptation, Licensor offers to -the recipient a license to the original Work on -the same terms and conditions as the license -granted to You under this License. - If any -provision of this License is invalid or -unenforceable under applicable law, it shall not -affect the validity or enforceability of the -remainder of the terms of this License, and -without further action by the parties to this -agreement, such provision shall be reformed to the -minimum extent necessary to make such provision -valid and enforceable. - No term or provision -of this License shall be deemed waived and no -breach consented to unless such waiver or consent -shall be in writing and signed by the party to be -charged with such waiver or consent. - This -License constitutes the entire agreement between -the parties with respect to the Work licensed -here. There are no understandings, agreements or -representations with respect to the Work not -specified here. Licensor shall not be bound by any -additional provisions that may appear in any -communication from You. This License may not be -modified without the mutual written agreement of -the Licensor and You. - The rights granted -under, and the subject matter referenced, in this -License were drafted utilizing the terminology of -the Berne Convention for the Protection of -Literary and Artistic Works (as amended on -September 28, 1979), the Rome Convention of 1961, -the WIPO Copyright Treaty of 1996, the WIPO -Performances and Phonograms Treaty of 1996 and the -Universal Copyright Convention (as revised on July -24, 1971). These rights and subject matter take -effect in the relevant jurisdiction in which the -License terms are sought to be enforced according -to the corresponding provisions of the -implementation of those treaty provisions in the -applicable national law. If the standard suite of -rights granted under applicable copyright law -includes additional rights not granted under this -License, such additional rights are deemed to be -included in the License; this License is not -intended to restrict the license of any rights -under applicable law. - +Löve Frames is licensed under the Creative +Commons Attribution 3.0 Unported (CC BY 3.0) license. +Below is the entire legal code for the license. +For more information on this license, please visit +this web page: http://creativecommons.org/licenses/by/3.0/ + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). +THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. +ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE +OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, +THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION +OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + "Adaptation" means a work based upon the Work, or upon the Work and other + pre-existing works, such as a translation, adaptation, derivative work, + arrangement of music or other alterations of a literary or artistic work, + or phonogram or performance and includes cinematographic adaptations or any + other form in which the Work may be recast, transformed, or adapted including + in any form recognizably derived from the original, except that a work that + constitutes a Collection will not be considered an Adaptation for the purpose + of this License. For the avoidance of doubt, where the Work is a musical work, + performance or phonogram, the synchronization of the Work in timed-relation with + a moving image ("synching") will be considered an Adaptation for the purpose of + this License. + + "Collection" means a collection of literary or artistic works, such as encyclopedias + and anthologies, or performances, phonograms or broadcasts, or other works or subject + matter other than works listed in Section 1(f) below, which, by reason of the selection + and arrangement of their contents, constitute intellectual creations, in which the Work + is included in its entirety in unmodified form along with one or more other contributions, + each constituting separate and independent works in themselves, which together are assembled + into a collective whole. A work that constitutes a Collection will not be considered an + Adaptation (as defined above) for the purposes of this License. + + "Distribute" means to make available to the public the original and copies of the Work or + Adaptation, as appropriate, through sale or other transfer of ownership. + + "Licensor" means the individual, individuals, entity or entities that offer(s) the Work + under the terms of this License. + + "Original Author" means, in the case of a literary or artistic work, the individual, + individuals, entity or entities who created the Work or if no individual or entity can be + identified, the publisher; and in addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or + otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a + phonogram the producer being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the organization that + transmits the broadcast. + + "Work" means the literary and/or artistic work offered under the terms of this License including + without limitation any production in the literary, scientific and artistic domain, whatever may + be the mode or form of its expression including digital form, such as a book, pamphlet and other + writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical + work; a choreographic work or entertainment in dumb show; a musical composition with or without words; + a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to + which are assimilated works expressed by a process analogous to photography; a work of applied art; an + illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture + or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected + as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not + otherwise considered a literary or artistic work. + + "You" means an individual or entity exercising rights under this License who has not previously violated + the terms of this License with respect to the Work, or who has received express permission from the Licensor + to exercise rights under this License despite a previous violation. + + "Publicly Perform" means to perform public recitations of the Work and to communicate to the public + those public recitations, by any means or process, including by wire or wireless means or public + digital performances; to make available to the public Works in such a way that members of the public + may access these Works from a place and at a place individually chosen by them; to perform the Work + to the public by any means or process and the communication to the public of the performances of the + Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including + signs, sounds or images. + + "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual + recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected + performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. + + Nothing in this License is intended to reduce, limit, or restrict any uses free from + copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright + protection under copyright law or other applicable laws. + +3. License Grant. + + Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, + royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the + rights in the Work as stated below: + + to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work + as incorporated in the Collections; + to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any + medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The original work was translated from + English to Spanish," or a modification could indicate "The original work has been modified."; + to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + to Distribute and Publicly Perform Adaptations. + + For the avoidance of doubt: + Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties + through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive + right to collect such royalties for any exercise by You of the rights granted under this License; + Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties + through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive + right to collect such royalties for any exercise by You of the rights granted under this License; and, + Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, + in the event that the Licensor is a member of a collecting society that administers voluntary licensing + schemes, via that society, from any exercise by You of the rights granted under this License. + + The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights + include the right to make such modifications as are technically necessary to exercise the rights in other media and + formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. + + The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a + copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute + or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License + or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of + the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to + the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute + or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict + the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms + of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require + the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, + upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required + by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. + + If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has + been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the + medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing + entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other + reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably + practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the + copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any + reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, + if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner + at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit + required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original + Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior + written permission of the Original Author, Licensor and/or Attribution Parties. + + Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, + Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, + mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's + honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in + Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other + derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, + this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under + Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO + REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, + NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, + WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH + EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. + + EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL + THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE + OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + This License and the rights granted hereunder will terminate automatically upon any breach by You of the + terms of this License. Individuals or entities who have received Adaptations or Collections from You under + this License, however, will not have their licenses terminated provided such individuals or entities remain + in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable + copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different + license terms or to stop distributing the Work at any time; provided, however that any such election will not serve + to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), + and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a + license to the Work on the same terms and conditions as the license granted to You under this License. + + Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to + the original Work on the same terms and conditions as the license granted to You under this License. + + If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the + validity or enforceability of the remainder of the terms of this License, and without further action by the + parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such + provision valid and enforceable. + + No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or + consent shall be in writing and signed by the party to be charged with such waiver or consent. + + This License constitutes the entire agreement between the parties with respect to the Work licensed here. + There are no understandings, agreements or representations with respect to the Work not specified here. + Licensor shall not be bound by any additional provisions that may appear in any communication from You. + This License may not be modified without the mutual written agreement of the Licensor and You. + + The rights granted under, and the subject matter referenced, in this License were drafted utilizing the + terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances + and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant jurisdiction in which the License terms are + sought to be enforced according to the corresponding provisions of the implementation of those treaty + provisions in the applicable national law. If the standard suite of rights granted under applicable + copyright law includes additional rights not granted under this License, such additional rights are deemed + to be included in the License; this License is not intended to restrict the license of any rights under + applicable law. diff --git a/objects/base.lua b/objects/base.lua index 134e5c8..4629ad4 100644 --- a/objects/base.lua +++ b/objects/base.lua @@ -711,7 +711,7 @@ function newobject:CheckHover() local baseparent = self:GetBaseParent() - if baseparent ~= modalobject and self.type ~= "multichoice-row" then + if baseparent ~= modalobject and self.type ~= "multichoicerow" then self.hover = false diff --git a/objects/internal/columnlist/columnlist-listarea.lua b/objects/internal/columnlist/columnlistarea.lua similarity index 100% rename from objects/internal/columnlist/columnlist-listarea.lua rename to objects/internal/columnlist/columnlistarea.lua diff --git a/objects/internal/columnlist/columnlist-row.lua b/objects/internal/columnlist/columnlistrow.lua similarity index 100% rename from objects/internal/columnlist/columnlist-row.lua rename to objects/internal/columnlist/columnlistrow.lua diff --git a/objects/internal/columnlist/coulmnlist-header.lua b/objects/internal/columnlist/coulmnlistheader.lua similarity index 100% rename from objects/internal/columnlist/coulmnlist-header.lua rename to objects/internal/columnlist/coulmnlistheader.lua diff --git a/objects/internal/multichoice/multichoice-list.lua b/objects/internal/multichoice/multichoicelist.lua similarity index 99% rename from objects/internal/multichoice/multichoice-list.lua rename to objects/internal/multichoice/multichoicelist.lua index 2977607..8ed6b1f 100644 --- a/objects/internal/multichoice/multichoice-list.lua +++ b/objects/internal/multichoice/multichoicelist.lua @@ -12,7 +12,7 @@ local newobject = loveframes.NewObject("multichoicelist", "loveframes_object_mul --]]--------------------------------------------------------- function newobject:initialize(object) - self.type = "multichoice-list" + self.type = "multichoicelist" self.parent = loveframes.base self.list = object self.x = object.x @@ -243,7 +243,7 @@ end --]]--------------------------------------------------------- function newobject:AddItem(object) - if object.type ~= "multichoice-row" then + if object.type ~= "multichoicerow" then return end diff --git a/objects/internal/multichoice/multichoice-row.lua b/objects/internal/multichoice/multichoicerow.lua similarity index 99% rename from objects/internal/multichoice/multichoice-row.lua rename to objects/internal/multichoice/multichoicerow.lua index 2fcfde1..369dbc5 100644 --- a/objects/internal/multichoice/multichoice-row.lua +++ b/objects/internal/multichoice/multichoicerow.lua @@ -12,7 +12,7 @@ local newobject = loveframes.NewObject("multichoicerow", "loveframes_object_mult --]]--------------------------------------------------------- function newobject:initialize() - self.type = "multichoice-row" + self.type = "multichoicerow" self.text = "" self.width = 50 self.height = 25 diff --git a/readme.md b/readme.md index f546fe4..f501e49 100644 --- a/readme.md +++ b/readme.md @@ -6,13 +6,13 @@ Love Frames is a GUI library for [LOVE](https://love2d.org/). For information on ## License -Love Frames is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license. -For more information on this license, please read license.txt or visit this web page: http://creativecommons.org/licenses/by-sa/3.0/ +Love Frames is licensed under the Creative Commons Attribution 3.0 Unported (CC BY 3.0) license. +For more information on this license, please read license.txt or visit this web page: http://creativecommons.org/licenses/by/3.0/ ## Credits Created by Kenny Shields -**Third Party Libraries** +**Third-Party Libraries** -- middleclass: kikito - https://github.com/kikito/middleclass \ No newline at end of file +- middleclass by kikito - https://github.com/kikito/middleclass \ No newline at end of file diff --git a/skins.lua b/skins.lua index 8f9b413..ffb5d7e 100644 --- a/skins.lua +++ b/skins.lua @@ -56,4 +56,15 @@ function loveframes.skins.Register(skin) end +end + +--[[--------------------------------------------------------- + - func: GetAvailable() + - desc: gets all available skins +--]]--------------------------------------------------------- +function loveframes.skins.GetAvailable() + + local available = loveframes.skins.available + return available + end \ No newline at end of file diff --git a/skins/Blue (basic)/images/arrow-down.png b/skins/Blue (basic)/images/arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..14e39181a536a2a53513f343b3908411a4a6d406 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP?dqF zi(`mJaB_l#&4PssAKEMOlw@WnkdAeY3!GATzwp*Exaa1q UKV&~G4XBsF)78&qol`;+0IT6KHvj+t literal 0 HcmV?d00001 diff --git a/skins/Blue (basic)/images/arrow-left.png b/skins/Blue (basic)/images/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7aff59ebf2df434fc6c058c2f26db6003066e7c2 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvPM# zT^vI+f|C;#uw`Uq{NO*ta+XPxiLt3Gk&9EyEvzHlaF^4onLM9OFXp*jcQ7!SU@EXy dB07bEp_{pn5XfL1avc)I$ztaD0e0ssV!HPiqA literal 0 HcmV?d00001 diff --git a/skins/Blue (basic)/images/arrow-right.png b/skins/Blue (basic)/images/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..159cd41e72ab30068f715cc4871a45b57d3a0b6b GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvQYB zT^vI+f|C;z#7#_0{;(%5`qC`Y#1JTz(A9aVVa<#MY$Zo4Oef?TIr>kMkz(;x(GqIt ZVwg2AXT4E}gcQ&K22WQ%mvv4FO#o!JGlKvC literal 0 HcmV?d00001 diff --git a/skins/Blue (basic)/images/arrow-up.png b/skins/Blue (basic)/images/arrow-up.png new file mode 100644 index 0000000000000000000000000000000000000000..20d04c7a6f7a86f899feea0bd42c80e4d7782b30 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$pehSb z7sn8d;N*k_+8G%cKm4b(Dzqv%1Tgz3Mwr_1zThg%I!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP*sJe zi(`m||Jun9`5F{BS}OnB+Z2`Zc75>>+h{qvK%P_MQ~SzQ38A@N+ne9ssP$cw%5x-- zt;)g8{&WH32SLTaH+EIAVi982g(64pH?0rJU`s6ZOq6_3{O!ivaF5j;oj-gcUb$pX rn3kL+&cC?Narfzqbv{eKsW@8KHKm2zN%(#e=mrK)S3j3^P6kQAdw+)5#y#_m29 theight then + parent:SetTabHeight(imageheight + 5) + object.height = imageheight + 5 + else + parent:SetTabHeight(theight + 5) + object.height = theight + 5 + end + else + object.width = 10 + twidth + parent:SetTabHeight(theight + 5) + object.height = theight + 5 + end + + local width = object:GetWidth() + local height = object:GetHeight() + + if tabnumber == ptabnumber then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + + if image then + -- button image + love.graphics.setColor(255, 255, 255, 255) + love.graphics.draw(image, x + 5, y + height/2 - imageheight/2) + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + imagewidth + 10, y + height/2 - theight/2) + else + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + 5, y + height/2 - theight/2) + end + + else + + -- button body + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + + if image then + -- button image + love.graphics.setColor(255, 255, 255, 150) + love.graphics.draw(image, x + 5, y + height/2 - imageheight/2) + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(object.text, x + imagewidth + 10, y + height/2 - theight/2) + else + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(object.text, x + 5, y + height/2 - theight/2) + end + + end + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoice(object) + - desc: draws the multi choice object +--]]--------------------------------------------------------- +function skin.DrawMultiChoice(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local choice = object:GetChoice() + local image = skin.images["multichoice-arrow.png"] + local font = skin.controls.multichoice_text_font + local theight = font:getHeight("a") + local bodycolor = skin.controls.multichoice_body_color + local textcolor = skin.controls.multichoice_text_color + local bordercolor = skin.controls.multichoice_border_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + love.graphics.setColor(unpack(textcolor)) + love.graphics.setFont(font) + + if choice == "" then + love.graphics.print(text, x + 5, y + height/2 - theight/2) + else + love.graphics.print(choice, x + 5, y + height/2 - theight/2) + end + + love.graphics.setColor(255, 255, 255, 255) + love.graphics.draw(image, x + width - 20, y + 5) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoiceList(object) + - desc: draws the multi choice list object +--]]--------------------------------------------------------- +function skin.DrawMultiChoiceList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.multichoicelist_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawOverMultiChoiceList(object) + - desc: draws over the multi choice list object +--]]--------------------------------------------------------- +function skin.DrawOverMultiChoiceList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.multichoicelist_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y - 1, width, height + 1) + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoiceRow(object) + - desc: draws the multi choice row object +--]]--------------------------------------------------------- +function skin.DrawMultiChoiceRow(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local font = skin.controls.multichoicerow_text_font + local bodyhovecolor = skin.controls.multichoicerow_body_hover_color + local texthovercolor = skin.controls.multichoicerow_text_hover_color + local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color + local textnohovercolor = skin.controls.multichoicerow_text_nohover_color + + love.graphics.setFont(font) + + if object.hover then + love.graphics.setColor(unpack(bodyhovecolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + 5, y + 5) + else + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(text, x + 5, y + 5) + end + +end + +--[[--------------------------------------------------------- + - func: DrawToolTip(object) + - desc: draws the tool tip object +--]]--------------------------------------------------------- +function skin.DrawToolTip(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.tooltip_body_color + local bordercolor = skin.controls.tooltip_border_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawText(object) + - desc: draws the text object +--]]--------------------------------------------------------- +function skin.DrawText(object) + +end + +--[[--------------------------------------------------------- + - func: DrawTextInput(object) + - desc: draws the text input object +--]]--------------------------------------------------------- +function skin.DrawTextInput(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local font = object:GetFont() + local focus = object:GetFocus() + local showindicator = object:GetIndicatorVisibility() + local alltextselected = object:IsAllTextSelected() + local textx = object:GetTextX() + local texty = object:GetTextY() + local text = object:GetText() + local multiline = object:GetMultiLine() + local lines = object:GetLines() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local indicatorx = object:GetIndicatorX() + local indicatory = object:GetIndicatorY() + local vbar = object:HasVerticalScrollBar() + local hbar = object:HasHorizontalScrollBar() + local linenumbers = object:GetLineNumbersEnabled() + local itemwidth = object:GetItemWidth() + local theight = font:getHeight("a") + local bodycolor = skin.controls.textinput_body_color + local textnormalcolor = skin.controls.textinput_text_normal_color + local textselectedcolor = skin.controls.textinput_text_selected_color + local highlightbarcolor = skin.controls.textinput_highlight_bar_color + local indicatorcolor = skin.controls.textinput_indicator_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + + if alltextselected then + local bary = 0 + if multiline then + for i=1, #lines do + local twidth = font:getWidth(lines[i]) + love.graphics.setColor(unpack(highlightbarcolor)) + love.graphics.rectangle("fill", textx, texty + bary, twidth, theight) + bary = bary + theight + end + else + local twidth = font:getWidth(text) + love.graphics.setColor(unpack(highlightbarcolor)) + love.graphics.rectangle("fill", textx, texty, twidth, theight) + end + end + + if showindicator and focus then + love.graphics.setColor(unpack(indicatorcolor)) + love.graphics.rectangle("fill", indicatorx, indicatory, 1, theight) + end + + if not multiline then + object:SetTextOffsetY(height/2 - theight/2) + if offsetx ~= 0 then + object:SetTextOffsetX(0) + else + object:SetTextOffsetX(5) + end + else + if vbar then + if offsety ~= 0 then + if hbar then + object:SetTextOffsetY(5) + else + object:SetTextOffsetY(-5) + end + else + object:SetTextOffsetY(5) + end + else + object:SetTextOffsetY(5) + end + + if hbar then + if offsety ~= 0 then + if linenumbers then + local panel = object:GetLineNumbersPanel() + if vbar then + object:SetTextOffsetX(5) + else + object:SetTextOffsetX(-5) + end + else + if vbar then + object:SetTextOffsetX(5) + else + object:SetTextOffsetX(-5) + end + end + else + object:SetTextOffsetX(5) + end + else + object:SetTextOffsetX(5) + end + + end + + textx = object:GetTextX() + texty = object:GetTextY() + + love.graphics.setFont(font) + + if alltextselected then + love.graphics.setColor(unpack(textselectedcolor)) + else + love.graphics.setColor(unpack(textnormalcolor)) + end + + if multiline then + for i=1, #lines do + love.graphics.print(lines[i], textx, texty + theight * i - theight) + end + else + love.graphics.print(lines[1], textx, texty) + end + +end + +--[[--------------------------------------------------------- + - func: DrawOverTextInput(object) + - desc: draws over the text input object +--]]--------------------------------------------------------- +function skin.DrawOverTextInput(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.textinput_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawScrollButton(object) + - desc: draws the scroll button object +--]]--------------------------------------------------------- +function skin.DrawScrollButton(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local scrolltype = object:GetScrollType() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color + local bordernohovercolor = skin.controls.button_border_nohover_color + + if down then + + -- button body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height) + + elseif hover then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderhovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + else + + -- button body + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + end + + if scrolltype == "up" then + local image = skin.images["arrow-up.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "down" then + local image = skin.images["arrow-down.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "left" then + local image = skin.images["arrow-left.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "right" then + local image = skin.images["arrow-right.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawSlider(object) + - desc: draws the slider object +--]]--------------------------------------------------------- +function skin.DrawSlider(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local slidtype = object:GetSlideType() + local baroutlinecolor = skin.controls.slider_bar_outline_color + local barcolor = skin.controls.slider_bar_color + + if slidtype == "horizontal" then + + love.graphics.setColor(unpack(baroutlinecolor)) + love.graphics.rectangle("fill", x, y + height/2 - 5, width, 10) + + love.graphics.setColor(unpack(barcolor)) + love.graphics.rectangle("fill", x + 5, y + height/2, width - 10, 1) + + elseif slidtype == "vertical" then + + love.graphics.setColor(unpack(baroutlinecolor)) + love.graphics.rectangle("fill", x + width/2 - 5, y, 10, height) + + love.graphics.setColor(unpack(barcolor)) + love.graphics.rectangle("fill", x + width/2, y + 5, 1, height - 10) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawSliderButton(object) + - desc: draws the slider button object +--]]--------------------------------------------------------- +function skin.DrawSliderButton(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color + local bordernohovercolor = skin.controls.button_border_down_color + + if down then + + -- button body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height) + + elseif hover then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderhovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + else + + -- button body + love.graphics.setColor(unpack(bodynohvercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawCheckBox(object) + - desc: draws the check box object +--]]--------------------------------------------------------- +function skin.DrawCheckBox(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetBoxWidth() + local height = object:GetBoxHeight() + local checked = object:GetChecked() + + love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) + skin.OutlinedRectangle(x, y, width, height) + + if checked then + love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) + love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawCollapsibleCategory(object) + - desc: draws the collapsible category object +--]]--------------------------------------------------------- +function skin.DrawCollapsibleCategory(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local bodycolor = skin.controls.collapsiblecategory_body_color + local textcolor = skin.controls.collapsiblecategory_text_color + local bordercolor = skin.controls.collapsiblecategory_border_color + local font = smallfont + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setFont(font) + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(text, x + 5, y + 5) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnList(object) + - desc: draws the column list object +--]]--------------------------------------------------------- +function skin.DrawColumnList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlist_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListHeader(object) + - desc: draws the column list header object +--]]--------------------------------------------------------- +function skin.DrawColumnListHeader(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local down = object.down + local font = skin.controls.columnlistheader_text_font + local twidth = font:getWidth(object.name) + local theight = font:getHeight(object.name) + local bodydowncolor = skin.controls.columnlistheader_body_down_color + local textdowncolor = skin.controls.columnlistheader_text_down_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local bodyhovercolor = skin.controls.columnlistheader_body_hover_color + local textdowncolor = skin.controls.columnlistheader_text_hover_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local nohovercolor = skin.controls.columnlistheader_body_nohover_color + local textnohovercolor = skin.controls.columnlistheader_text_nohover_color + local bordernohovercolor = skin.controls.columnlistheader_border_down_color + + if down then + + -- header body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textdowncolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + elseif hover then + + -- header body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textdowncolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + else + + -- header body + love.graphics.setColor(unpack(nohovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListArea(object) + - desc: draws the column list area object +--]]--------------------------------------------------------- +function skin.DrawColumnListArea(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlistarea_body_color + + love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawOverColumnListArea(object) + - desc: draws over the column list area object +--]]--------------------------------------------------------- +function skin.DrawOverColumnListArea(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.columnlist_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListRow(object) + - desc: draws the column list row object +--]]--------------------------------------------------------- +function skin.DrawColumnListRow(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local colorindex = object:GetColorIndex() + local font = object:GetFont() + local columndata = object:GetColumnData() + local textx = object:GetTextX() + local texty = object:GetTextY() + local parent = object:GetParent() + local cwidth, cheight = parent:GetParent():GetColumnSize() + local theight = font:getHeight("a") + local body1color = skin.controls.columnlistrow_body1_color + local border1color = skin.controls.columnlistrow_border1_color + local body2color = skin.controls.columnlistrow_body2_color + local border2color = skin.controls.columnlistrow_border2_color + local textcolor = skin.controls.columnlistrow_text_color + + object:SetTextPos(5, height/2 - theight/2) + + if colorindex == 1 then + + love.graphics.setColor(unpack(body1color)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + love.graphics.setColor(unpack(skin.controls.columnlistrow_border1_color)) + skin.OutlinedRectangle(x, y, width, height, true, false, true, true) + + else + + love.graphics.setColor(unpack(body2color)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(border2color)) + skin.OutlinedRectangle(x, y, width, height, true, false, true, true) + + end + + for k, v in ipairs(columndata) do + love.graphics.setFont(font) + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(v, x + textx, y + texty) + x = x + cwidth + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawModalBackground(object) + - desc: draws the modal background object +--]]--------------------------------------------------------- +function skin.DrawModalBackground(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.modalbackground_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawLineNumbersPanel(object) + - desc: draws the line numbers panel object +--]]--------------------------------------------------------- +function skin.DrawLineNumbersPanel(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local offsety = object:GetOffsetY() + local parent = object:GetParent() + local lines = parent:GetLines() + local font = parent:GetFont() + local theight = font:getHeight("a") + local bordercolor = skin.controls.linenumberspanel_border_color + local textcolor = skin.controls.linenumberspanel_text_color + local mody = y + + object:SetWidth(10 + font:getWidth(#lines)) + love.graphics.setFont(font) + + love.graphics.setColor(200, 200, 200, 255) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height, true, true, true, false) + + for i=1, #lines do + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(i, object.x + 5, mody - offsety) + mody = mody + theight + end + +end + +-- register the skin +loveframes.skins.Register(skin) \ No newline at end of file diff --git a/skins/Blue/skin.lua b/skins/Blue/skin.lua index 58114a9..286aeee 100644 --- a/skins/Blue/skin.lua +++ b/skins/Blue/skin.lua @@ -7,13 +7,13 @@ local skin = {} -- skin info (you always need this in a skin) -skin.name = "Blue" -skin.author = "Nikolai Resokav" +skin.name = "Blue" +skin.author = "Nikolai Resokav" skin.version = "1.0" -local smallfont = love.graphics.newFont(10) +local smallfont = love.graphics.newFont(10) local imagebuttonfont = love.graphics.newFont(15) -local bordercolor = {143, 143, 143, 255} +local bordercolor = {143, 143, 143, 255} -- controls skin.controls = {} @@ -39,7 +39,7 @@ skin.controls.button_text_font = smallfont -- image button skin.controls.imagebutton_text_down_color = {255, 255, 255, 255} -skin.controls.imagebutton_text_nohover_color = {0, 0, 0, 200} +skin.controls.imagebutton_text_nohover_color = {255, 255, 255, 200} skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255} skin.controls.imagebutton_text_font = imagebuttonfont @@ -204,60 +204,18 @@ function skin.OutlinedRectangle(x, y, width, height, ovt, ovb, ovl, ovr) end ---[[--------------------------------------------------------- - - func: DrawRepeatingImage(image, x, y, width, height) - - desc: draw a repeating image ---]]--------------------------------------------------------- -function skin.DrawRepeatingImage(image, x, y, width, height) - - local image = image - local iwidth = image:getWidth() - local iheight = image:getHeight() - local cords = {} - local posx = 0 - local posy = 0 - local stencilfunc = function() love.graphics.rectangle("fill", x, y, width, height) end - local stencil = love.graphics.newStencil(stencilfunc) - local images = 0 - - while posy < height do - - table.insert(cords, {posx, posy}) - - if posx >= width then - posx = 0 - posy = posy + iheight - else - posx = posx + iwidth - end - - end - - love.graphics.setStencil(stencil) - - for k, v in ipairs(cords) do - love.graphics.setColor(255, 255, 255, 255) - love.graphics.draw(image, x + v[1], y + v[2]) - images = images + 1 - end - - love.graphics.setStencil() - -end - --[[--------------------------------------------------------- - func: skin.DrawGradient(x, y, width, height, color) - desc: draws a gradient --]]--------------------------------------------------------- function skin.DrawGradient(x, y, width, height, color) - local color = color + local color = color local percent = 0 - local once = false - for i=1, height - 1 do + for i=1, (height - 1) do percent = i/height * 255 - color = {color[1], color[2], color[3], loveframes.util.Round(percent)} + color[4] = loveframes.util.Round(percent) love.graphics.setColor(unpack(color)) love.graphics.rectangle("fill", x, y + i, width, 1) end @@ -270,18 +228,18 @@ end --]]--------------------------------------------------------- function skin.DrawFrame(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local name = object:GetName() - local bodycolor = skin.controls.frame_body_color - local topcolor = skin.controls.frame_top_color - local bordercolor = skin.controls.frame_border_color - local namecolor = skin.controls.frame_name_color - local font = skin.controls.frame_name_font - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local bodycolor = skin.controls.frame_body_color + local topcolor = skin.controls.frame_top_color + local bordercolor = skin.controls.frame_border_color + local namecolor = skin.controls.frame_name_color + local font = skin.controls.frame_name_font + local gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3] - 20, 255} -- frame body love.graphics.setColor(unpack(bodycolor)) @@ -290,7 +248,6 @@ function skin.DrawFrame(object) -- frame top bar love.graphics.setColor(unpack(topcolor)) love.graphics.rectangle("fill", x, y, width, 25) - gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3] - 20, 255} skin.DrawGradient(x, y, width, 25, gradientcolor) love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y + 25, width, 1) @@ -312,26 +269,26 @@ end --]]--------------------------------------------------------- function skin.DrawButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local text = object:GetText() - local font = skin.controls.button_text_font - local twidth = font:getWidth(object.text) - local theight = font:getHeight(object.text) - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local textdowncolor = skin.controls.button_text_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local texthovercolor = skin.controls.button_text_hover_color - local borderhovercolor = skin.controls.button_border_down_color - local bodynohvercolor = skin.controls.button_body_nohover_color - local textnohovercolor = skin.controls.button_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local text = object:GetText() + local font = skin.controls.button_text_font + local twidth = font:getWidth(object.text) + local theight = font:getHeight(object.text) + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local textdowncolor = skin.controls.button_text_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local texthovercolor = skin.controls.button_text_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color + local textnohovercolor = skin.controls.button_text_nohover_color local bordernohovercolor = skin.controls.button_border_down_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -397,23 +354,22 @@ end --]]--------------------------------------------------------- function skin.DrawCloseButton(object) - local x = object:GetX() - local y = object:GetY() - local staticx = object:GetStaticX() - local width = object:GetWidth() - local height = object:GetHeight() - local parentwidth = object.parent:GetWidth() - local index = loveframes.config["ACTIVESKIN"] - local font = skin.controls.button_text_font - local twidth = font:getWidth("X") - local theight = font:getHeight("X") - local hover = object:GetHover() - local down = object.down - local image = skin.images["close.png"] - local bodydowncolor = skin.controls.closebutton_body_down_color - local bodyhovercolor = skin.controls.closebutton_body_hover_color + local x = object:GetX() + local y = object:GetY() + local staticx = object:GetStaticX() + local width = object:GetWidth() + local height = object:GetHeight() + local parentwidth = object.parent:GetWidth() + local index = loveframes.config["ACTIVESKIN"] + local font = skin.controls.button_text_font + local twidth = font:getWidth("X") + local theight = font:getHeight("X") + local hover = object:GetHover() + local down = object.down + local image = skin.images["close.png"] + local bodydowncolor = skin.controls.closebutton_body_down_color + local bodyhovercolor = skin.controls.closebutton_body_hover_color local bodynohovercolor = skin.controls.closebutton_body_nohover_color - local gradientcolor = {} if down == true then @@ -447,17 +403,17 @@ end --]]--------------------------------------------------------- function skin.DrawImage(object) - local x = object:GetX() - local y = object:GetY() + local x = object:GetX() + local y = object:GetY() local orientation = object:GetOrientation() - local scalex = object:GetScaleX() - local scaley = object:GetScaleY() - local offsetx = object:GetOffsetX() - local offsety = object:GetOffsetY() - local shearx = object:GetShearX() - local sheary = object:GetShearY() - local image = object.image - local color = object.imagecolor + local scalex = object:GetScaleX() + local scaley = object:GetScaleY() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local shearx = object:GetShearX() + local sheary = object:GetShearY() + local image = object.image + local color = object.imagecolor if color then love.graphics.setColor(unpack(color)) @@ -475,17 +431,20 @@ end --]]--------------------------------------------------------- function skin.DrawImageButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local hover = object:GetHover() - local image = object:GetImage() - local down = object.down - local font = skin.controls.imagebutton_text_font - local twidth = font:getWidth(object.text) + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local hover = object:GetHover() + local image = object:GetImage() + local down = object.down + local font = skin.controls.imagebutton_text_font + local twidth = font:getWidth(object.text) local theight = font:getHeight(object.text) + local textdowncolor = skin.controls.imagebutton_text_down_color + local texthovercolor = skin.controls.imagebutton_text_hover_color + local textnohovercolor = skin.controls.imagebutton_text_nohover_color if down then @@ -497,7 +456,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) + love.graphics.setColor(unpack(textdowncolor)) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1) elseif hover then @@ -510,7 +469,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_hover_color)) + love.graphics.setColor(unpack(texthovercolor)) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) else @@ -523,7 +482,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) + love.graphics.setColor(unpack(textnohovercolor)) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) end @@ -536,29 +495,28 @@ end --]]--------------------------------------------------------- function skin.DrawProgressBar(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local value = object:GetValue() - local max = object:GetMax() - local barwidth = object:GetBarWidth() - local font = skin.controls.progressbar_text_font - local text = value .. "/" ..max - local twidth = font:getWidth(text) - local theight = font:getHeight("a") - local bodycolor = skin.controls.progressbar_body_color - local barcolor = skin.controls.progressbar_bar_color - local textcolor = skin.controls.progressbar_text_color - local bordercolor = skin.controls.progressbar_border_color - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local value = object:GetValue() + local max = object:GetMax() + local barwidth = object:GetBarWidth() + local font = skin.controls.progressbar_text_font + local text = value .. "/" ..max + local twidth = font:getWidth(text) + local theight = font:getHeight("a") + local bodycolor = skin.controls.progressbar_body_color + local barcolor = skin.controls.progressbar_bar_color + local textcolor = skin.controls.progressbar_text_color + local bordercolor = skin.controls.progressbar_border_color + local gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255} -- progress bar body love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) love.graphics.setColor(unpack(barcolor)) love.graphics.rectangle("fill", x, y, barwidth, height) - gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255} skin.DrawGradient(x, y, barwidth, height, gradientcolor) love.graphics.setFont(font) love.graphics.setColor(unpack(textcolor)) @@ -576,13 +534,13 @@ end --]]--------------------------------------------------------- function skin.DrawScrollArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bartype = object:GetBarType() - local bodycolor = skin.controls.scrollarea_body_color - local bordercolor = skin.controls.scrollarea_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bartype = object:GetBarType() + local bodycolor = skin.controls.scrollarea_body_color + local bordercolor = skin.controls.scrollarea_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -602,20 +560,20 @@ end --]]--------------------------------------------------------- function skin.DrawScrollBar(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local dragging = object:IsDragging() - local hover = object:GetHover() - local bartype = object:GetBarType() - local bodydowncolor = skin.controls.scrollbar_body_down_color - local borderdowncolor = skin.controls.scrollbar_border_down_color - local bodyhovercolor = skin.controls.scrollbar_body_hover_color - local borderhovercolor = skin.controls.scrollbar_border_hover_color - local bodynohvercolor = skin.controls.scrollbar_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local dragging = object:IsDragging() + local hover = object:GetHover() + local bartype = object:GetBarType() + local bodydowncolor = skin.controls.scrollbar_body_down_color + local borderdowncolor = skin.controls.scrollbar_border_down_color + local bodyhovercolor = skin.controls.scrollbar_body_hover_color + local borderhovercolor = skin.controls.scrollbar_border_hover_color + local bodynohvercolor = skin.controls.scrollbar_body_nohover_color local bordernohovercolor = skin.controls.scrollbar_border_nohover_color - local gradientcolor = {} + local gradientcolor = {} if dragging then love.graphics.setColor(unpack(bodydowncolor)) @@ -660,11 +618,11 @@ end --]]--------------------------------------------------------- function skin.DrawScrollBody(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.scrollbody_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.scrollbody_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -677,12 +635,12 @@ end --]]--------------------------------------------------------- function skin.DrawPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.panel_body_color - local bordercolor = skin.controls.panel_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.panel_body_color + local bordercolor = skin.controls.panel_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -697,11 +655,11 @@ end --]]--------------------------------------------------------- function skin.DrawList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.list_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.list_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -714,11 +672,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordrcolor = skin.controls.list_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordrcolor = skin.controls.list_border_color love.graphics.setColor(unpack(bordrcolor)) skin.OutlinedRectangle(x, y, width, height) @@ -731,13 +689,13 @@ end --]]--------------------------------------------------------- function skin.DrawTabPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local buttonheight = object:GetHeightOfButtons() - local bodycolor = skin.controls.tabpanel_body_color - local bordercolor = skin.controls.tabpanel_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local buttonheight = object:GetHeightOfButtons() + local bodycolor = skin.controls.tabpanel_body_color + local bordercolor = skin.controls.tabpanel_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y + buttonheight, width, height - buttonheight) @@ -754,25 +712,25 @@ end --]]--------------------------------------------------------- function skin.DrawTabButton(object) - local x = object:GetX() - local y = object:GetY() - local hover = object:GetHover() - local text = object:GetText() - local image = object:GetImage() - local tabnumber = object:GetTabNumber() - local parent = object:GetParent() - local ptabnumber = parent:GetTabNumber() - local font = skin.controls.tab_text_font - local twidth = font:getWidth(object.text) - local theight = font:getHeight(object.text) - local imagewidth = 0 - local imageheight = 0 - local bordercolor = skin.controls.tabpanel_border_color - local bodyhovercolor = skin.controls.button_body_hover_color - local texthovercolor = skin.controls.button_text_hover_color - local bodynohovercolor = skin.controls.button_body_nohover_color - local textnohovercolor = skin.controls.button_text_nohover_color - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local hover = object:GetHover() + local text = object:GetText() + local image = object:GetImage() + local tabnumber = object:GetTabNumber() + local parent = object:GetParent() + local ptabnumber = parent:GetTabNumber() + local font = skin.controls.tab_text_font + local twidth = font:getWidth(object.text) + local theight = font:getHeight(object.text) + local imagewidth = 0 + local imageheight = 0 + local bordercolor = skin.controls.tabpanel_border_color + local bodyhovercolor = skin.controls.button_body_hover_color + local texthovercolor = skin.controls.button_text_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color + local textnohovercolor = skin.controls.button_text_nohover_color + local gradientcolor = {} if image then imagewidth = image:getWidth() @@ -858,18 +816,18 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoice(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local choice = object:GetChoice() - local image = skin.images["multichoice-arrow.png"] - local font = skin.controls.multichoice_text_font - local theight = font:getHeight("a") - local bodycolor = skin.controls.multichoice_body_color - local textcolor = skin.controls.multichoice_text_color - local bordercolor = skin.controls.multichoice_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local choice = object:GetChoice() + local image = skin.images["multichoice-arrow.png"] + local font = skin.controls.multichoice_text_font + local theight = font:getHeight("a") + local bodycolor = skin.controls.multichoice_body_color + local textcolor = skin.controls.multichoice_text_color + local bordercolor = skin.controls.multichoice_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) @@ -897,11 +855,11 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoiceList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.multichoicelist_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.multichoicelist_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -914,11 +872,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverMultiChoiceList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.multichoicelist_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.multichoicelist_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y - 1, width, height + 1) @@ -931,16 +889,16 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoiceRow(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local font = skin.controls.multichoicerow_text_font - local bodyhovecolor = skin.controls.multichoicerow_body_hover_color - local texthovercolor = skin.controls.multichoicerow_text_hover_color - local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color - local textnohovercolor = skin.controls.multichoicerow_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local font = skin.controls.multichoicerow_text_font + local bodyhovecolor = skin.controls.multichoicerow_body_hover_color + local texthovercolor = skin.controls.multichoicerow_text_hover_color + local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color + local textnohovercolor = skin.controls.multichoicerow_text_nohover_color love.graphics.setFont(font) @@ -964,12 +922,12 @@ end --]]--------------------------------------------------------- function skin.DrawToolTip(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.tooltip_body_color - local bordercolor = skin.controls.tooltip_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.tooltip_body_color + local bordercolor = skin.controls.tooltip_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -992,33 +950,33 @@ end --]]--------------------------------------------------------- function skin.DrawTextInput(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local font = object:GetFont() - local focus = object:GetFocus() - local showindicator = object:GetIndicatorVisibility() - local alltextselected = object:IsAllTextSelected() - local textx = object:GetTextX() - local texty = object:GetTextY() - local text = object:GetText() - local multiline = object:GetMultiLine() - local lines = object:GetLines() - local offsetx = object:GetOffsetX() - local offsety = object:GetOffsetY() - local indicatorx = object:GetIndicatorX() - local indicatory = object:GetIndicatorY() - local vbar = object:HasVerticalScrollBar() - local hbar = object:HasHorizontalScrollBar() - local linenumbers = object:GetLineNumbersEnabled() - local itemwidth = object:GetItemWidth() - local theight = font:getHeight("a") - local bodycolor = skin.controls.textinput_body_color - local textnormalcolor = skin.controls.textinput_text_normal_color - local textselectedcolor = skin.controls.textinput_text_selected_color - local highlightbarcolor = skin.controls.textinput_highlight_bar_color - local indicatorcolor = skin.controls.textinput_indicator_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local font = object:GetFont() + local focus = object:GetFocus() + local showindicator = object:GetIndicatorVisibility() + local alltextselected = object:IsAllTextSelected() + local textx = object:GetTextX() + local texty = object:GetTextY() + local text = object:GetText() + local multiline = object:GetMultiLine() + local lines = object:GetLines() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local indicatorx = object:GetIndicatorX() + local indicatory = object:GetIndicatorY() + local vbar = object:HasVerticalScrollBar() + local hbar = object:HasHorizontalScrollBar() + local linenumbers = object:GetLineNumbersEnabled() + local itemwidth = object:GetItemWidth() + local theight = font:getHeight("a") + local bodycolor = skin.controls.textinput_body_color + local textnormalcolor = skin.controls.textinput_text_normal_color + local textselectedcolor = skin.controls.textinput_text_selected_color + local highlightbarcolor = skin.controls.textinput_highlight_bar_color + local indicatorcolor = skin.controls.textinput_indicator_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1118,11 +1076,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverTextInput(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.textinput_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.textinput_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) @@ -1135,20 +1093,20 @@ end --]]--------------------------------------------------------- function skin.DrawScrollButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local scrolltype = object:GetScrollType() - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local borderhovercolor = skin.controls.button_border_hover_color - local bodynohovercolor = skin.controls.button_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local scrolltype = object:GetScrollType() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color local bordernohovercolor = skin.controls.button_border_nohover_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1193,36 +1151,44 @@ function skin.DrawScrollButton(object) if scrolltype == "up" then local image = skin.images["arrow-up.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "down" then local image = skin.images["arrow-down.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "left" then local image = skin.images["arrow-left.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "right" then local image = skin.images["arrow-right.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) end end @@ -1233,13 +1199,13 @@ end --]]--------------------------------------------------------- function skin.DrawSlider(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local slidtype = object:GetSlideType() - local baroutlinecolor = skin.controls.slider_bar_outline_color - local barcolor = skin.controls.slider_bar_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local slidtype = object:GetSlideType() + local baroutlinecolor = skin.controls.slider_bar_outline_color + local barcolor = skin.controls.slider_bar_color if slidtype == "horizontal" then @@ -1267,19 +1233,19 @@ end --]]--------------------------------------------------------- function skin.DrawSliderButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local borderhovercolor = skin.controls.button_border_down_color - local bodynohvercolor = skin.controls.button_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color local bordernohovercolor = skin.controls.button_border_down_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1330,24 +1296,32 @@ end --]]--------------------------------------------------------- function skin.DrawCheckBox(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetBoxWidth() - local height = object:GetBoxHeight() - local checked = object:GetChecked() - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetBoxWidth() + local height = object:GetBoxHeight() + local checked = object:GetChecked() + local hover = object:GetHover() + local bodycolor = skin.controls.checkbox_body_color + local bordercolor = skin.controls.checkbox_border_color + local checkcolor = skin.controls.checkbox_check_color - love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) + love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) - love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) + love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) if checked then - love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) + love.graphics.setColor(unpack(checkcolor)) love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) end + if hover then + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x + 4, y + 4, width - 8, height - 8) + end + end --[[--------------------------------------------------------- @@ -1356,16 +1330,16 @@ end --]]--------------------------------------------------------- function skin.DrawCollapsibleCategory(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local bodycolor = skin.controls.collapsiblecategory_body_color - local textcolor = skin.controls.collapsiblecategory_text_color - local bordercolor = skin.controls.collapsiblecategory_border_color - local font = smallfont - local gradientcolor = {bodycolor[1] - 20, bodycolor[2] - 20, bodycolor[3] - 20, 255} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local bodycolor = skin.controls.collapsiblecategory_body_color + local textcolor = skin.controls.collapsiblecategory_text_color + local bordercolor = skin.controls.collapsiblecategory_border_color + local font = smallfont + local gradientcolor = {bodycolor[1] - 20, bodycolor[2] - 20, bodycolor[3] - 20, 255} love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1388,11 +1362,11 @@ end --]]--------------------------------------------------------- function skin.DrawColumnList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.columnlist_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlist_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1405,26 +1379,26 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListHeader(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local name = object:GetName() - local down = object.down - local font = skin.controls.columnlistheader_text_font - local twidth = font:getWidth(object.name) - local theight = font:getHeight(object.name) - local bodydowncolor = skin.controls.columnlistheader_body_down_color - local textdowncolor = skin.controls.columnlistheader_text_down_color - local borderdowncolor = skin.controls.columnlistheader_border_down_color - local bodyhovercolor = skin.controls.columnlistheader_body_hover_color - local textdowncolor = skin.controls.columnlistheader_text_hover_color - local borderdowncolor = skin.controls.columnlistheader_border_down_color - local nohovercolor = skin.controls.columnlistheader_body_nohover_color - local textnohovercolor = skin.controls.columnlistheader_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local down = object.down + local font = skin.controls.columnlistheader_text_font + local twidth = font:getWidth(object.name) + local theight = font:getHeight(object.name) + local bodydowncolor = skin.controls.columnlistheader_body_down_color + local textdowncolor = skin.controls.columnlistheader_text_down_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local bodyhovercolor = skin.controls.columnlistheader_body_hover_color + local textdowncolor = skin.controls.columnlistheader_text_hover_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local nohovercolor = skin.controls.columnlistheader_body_nohover_color + local textnohovercolor = skin.controls.columnlistheader_text_nohover_color local bordernohovercolor = skin.controls.columnlistheader_border_down_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1490,13 +1464,13 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.columnlistarea_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlistarea_body_color - love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) + love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) end @@ -1507,11 +1481,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverColumnListArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.columnlist_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.columnlist_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) @@ -1524,23 +1498,23 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListRow(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local colorindex = object:GetColorIndex() - local font = object:GetFont() - local columndata = object:GetColumnData() - local textx = object:GetTextX() - local texty = object:GetTextY() - local parent = object:GetParent() - local cwidth, cheight = parent:GetParent():GetColumnSize() - local theight = font:getHeight("a") - local body1color = skin.controls.columnlistrow_body1_color - local border1color = skin.controls.columnlistrow_border1_color - local body2color = skin.controls.columnlistrow_body2_color - local border2color = skin.controls.columnlistrow_border2_color - local textcolor = skin.controls.columnlistrow_text_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local colorindex = object:GetColorIndex() + local font = object:GetFont() + local columndata = object:GetColumnData() + local textx = object:GetTextX() + local texty = object:GetTextY() + local parent = object:GetParent() + local cwidth, cheight = parent:GetParent():GetColumnSize() + local theight = font:getHeight("a") + local body1color = skin.controls.columnlistrow_body1_color + local border1color = skin.controls.columnlistrow_border1_color + local body2color = skin.controls.columnlistrow_body2_color + local border2color = skin.controls.columnlistrow_border2_color + local textcolor = skin.controls.columnlistrow_text_color object:SetTextPos(5, height/2 - theight/2) @@ -1577,11 +1551,11 @@ end --]]--------------------------------------------------------- function skin.DrawModalBackground(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.modalbackground_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.modalbackground_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1594,18 +1568,18 @@ end --]]--------------------------------------------------------- function skin.DrawLineNumbersPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local offsety = object:GetOffsetY() - local parent = object:GetParent() - local lines = parent:GetLines() - local font = parent:GetFont() - local theight = font:getHeight("a") - local bordercolor = skin.controls.linenumberspanel_border_color - local textcolor = skin.controls.linenumberspanel_text_color - local mody = y + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local offsety = object:GetOffsetY() + local parent = object:GetParent() + local lines = parent:GetLines() + local font = parent:GetFont() + local theight = font:getHeight("a") + local bordercolor = skin.controls.linenumberspanel_border_color + local textcolor = skin.controls.linenumberspanel_text_color + local mody = y object:SetWidth(10 + font:getWidth(#lines)) love.graphics.setFont(font) diff --git a/skins/Orange (basic)/images/arrow-down.png b/skins/Orange (basic)/images/arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..14e39181a536a2a53513f343b3908411a4a6d406 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP?dqF zi(`mJaB_l#&4PssAKEMOlw@WnkdAeY3!GATzwp*Exaa1q UKV&~G4XBsF)78&qol`;+0IT6KHvj+t literal 0 HcmV?d00001 diff --git a/skins/Orange (basic)/images/arrow-left.png b/skins/Orange (basic)/images/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7aff59ebf2df434fc6c058c2f26db6003066e7c2 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvPM# zT^vI+f|C;#uw`Uq{NO*ta+XPxiLt3Gk&9EyEvzHlaF^4onLM9OFXp*jcQ7!SU@EXy dB07bEp_{pn5XfL1avc)I$ztaD0e0ssV!HPiqA literal 0 HcmV?d00001 diff --git a/skins/Orange (basic)/images/arrow-right.png b/skins/Orange (basic)/images/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..159cd41e72ab30068f715cc4871a45b57d3a0b6b GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvQYB zT^vI+f|C;z#7#_0{;(%5`qC`Y#1JTz(A9aVVa<#MY$Zo4Oef?TIr>kMkz(;x(GqIt ZVwg2AXT4E}gcQ&K22WQ%mvv4FO#o!JGlKvC literal 0 HcmV?d00001 diff --git a/skins/Orange (basic)/images/arrow-up.png b/skins/Orange (basic)/images/arrow-up.png new file mode 100644 index 0000000000000000000000000000000000000000..20d04c7a6f7a86f899feea0bd42c80e4d7782b30 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$pehSb z7sn8d;N*k_+8G%cKm4b(Dzqv%1Tgz3Mwr_1zThg%I!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP*sJe zi(`m||Jun9`5F{BS}OnB+Z2`Zc75>>+h{qvK%P_MQ~SzQ38A@N+ne9ssP$cw%5x-- zt;)g8{&WH32SLTaH+EIAVi982g(64pH?0rJU`s6ZOq6_3{O!ivaF5j;oj-gcUb$pX rn3kL+&cC?Narfzqbv{eKsW@8KHKm2zN%(#e=mrK)S3j3^P6kQAdw+)5#y#_m29 theight then + parent:SetTabHeight(imageheight + 5) + object.height = imageheight + 5 + else + parent:SetTabHeight(theight + 5) + object.height = theight + 5 + end + else + object.width = 10 + twidth + parent:SetTabHeight(theight + 5) + object.height = theight + 5 + end + + local width = object:GetWidth() + local height = object:GetHeight() + + if tabnumber == ptabnumber then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + + if image then + -- button image + love.graphics.setColor(255, 255, 255, 255) + love.graphics.draw(image, x + 5, y + height/2 - imageheight/2) + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + imagewidth + 10, y + height/2 - theight/2) + else + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + 5, y + height/2 - theight/2) + end + + else + + -- button body + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + + if image then + -- button image + love.graphics.setColor(255, 255, 255, 150) + love.graphics.draw(image, x + 5, y + height/2 - imageheight/2) + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(object.text, x + imagewidth + 10, y + height/2 - theight/2) + else + -- button text + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(object.text, x + 5, y + height/2 - theight/2) + end + + end + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoice(object) + - desc: draws the multi choice object +--]]--------------------------------------------------------- +function skin.DrawMultiChoice(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local choice = object:GetChoice() + local image = skin.images["multichoice-arrow.png"] + local font = skin.controls.multichoice_text_font + local theight = font:getHeight("a") + local bodycolor = skin.controls.multichoice_body_color + local textcolor = skin.controls.multichoice_text_color + local bordercolor = skin.controls.multichoice_border_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + love.graphics.setColor(unpack(textcolor)) + love.graphics.setFont(font) + + if choice == "" then + love.graphics.print(text, x + 5, y + height/2 - theight/2) + else + love.graphics.print(choice, x + 5, y + height/2 - theight/2) + end + + love.graphics.setColor(255, 255, 255, 255) + love.graphics.draw(image, x + width - 20, y + 5) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoiceList(object) + - desc: draws the multi choice list object +--]]--------------------------------------------------------- +function skin.DrawMultiChoiceList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.multichoicelist_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawOverMultiChoiceList(object) + - desc: draws over the multi choice list object +--]]--------------------------------------------------------- +function skin.DrawOverMultiChoiceList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.multichoicelist_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y - 1, width, height + 1) + +end + +--[[--------------------------------------------------------- + - func: DrawMultiChoiceRow(object) + - desc: draws the multi choice row object +--]]--------------------------------------------------------- +function skin.DrawMultiChoiceRow(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local font = skin.controls.multichoicerow_text_font + local bodyhovecolor = skin.controls.multichoicerow_body_hover_color + local texthovercolor = skin.controls.multichoicerow_text_hover_color + local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color + local textnohovercolor = skin.controls.multichoicerow_text_nohover_color + + love.graphics.setFont(font) + + if object.hover then + love.graphics.setColor(unpack(bodyhovecolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(texthovercolor)) + love.graphics.print(text, x + 5, y + 5) + else + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(text, x + 5, y + 5) + end + +end + +--[[--------------------------------------------------------- + - func: DrawToolTip(object) + - desc: draws the tool tip object +--]]--------------------------------------------------------- +function skin.DrawToolTip(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.tooltip_body_color + local bordercolor = skin.controls.tooltip_border_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawText(object) + - desc: draws the text object +--]]--------------------------------------------------------- +function skin.DrawText(object) + +end + +--[[--------------------------------------------------------- + - func: DrawTextInput(object) + - desc: draws the text input object +--]]--------------------------------------------------------- +function skin.DrawTextInput(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local font = object:GetFont() + local focus = object:GetFocus() + local showindicator = object:GetIndicatorVisibility() + local alltextselected = object:IsAllTextSelected() + local textx = object:GetTextX() + local texty = object:GetTextY() + local text = object:GetText() + local multiline = object:GetMultiLine() + local lines = object:GetLines() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local indicatorx = object:GetIndicatorX() + local indicatory = object:GetIndicatorY() + local vbar = object:HasVerticalScrollBar() + local hbar = object:HasHorizontalScrollBar() + local linenumbers = object:GetLineNumbersEnabled() + local itemwidth = object:GetItemWidth() + local theight = font:getHeight("a") + local bodycolor = skin.controls.textinput_body_color + local textnormalcolor = skin.controls.textinput_text_normal_color + local textselectedcolor = skin.controls.textinput_text_selected_color + local highlightbarcolor = skin.controls.textinput_highlight_bar_color + local indicatorcolor = skin.controls.textinput_indicator_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + + if alltextselected then + local bary = 0 + if multiline then + for i=1, #lines do + local twidth = font:getWidth(lines[i]) + love.graphics.setColor(unpack(highlightbarcolor)) + love.graphics.rectangle("fill", textx, texty + bary, twidth, theight) + bary = bary + theight + end + else + local twidth = font:getWidth(text) + love.graphics.setColor(unpack(highlightbarcolor)) + love.graphics.rectangle("fill", textx, texty, twidth, theight) + end + end + + if showindicator and focus then + love.graphics.setColor(unpack(indicatorcolor)) + love.graphics.rectangle("fill", indicatorx, indicatory, 1, theight) + end + + if not multiline then + object:SetTextOffsetY(height/2 - theight/2) + if offsetx ~= 0 then + object:SetTextOffsetX(0) + else + object:SetTextOffsetX(5) + end + else + if vbar then + if offsety ~= 0 then + if hbar then + object:SetTextOffsetY(5) + else + object:SetTextOffsetY(-5) + end + else + object:SetTextOffsetY(5) + end + else + object:SetTextOffsetY(5) + end + + if hbar then + if offsety ~= 0 then + if linenumbers then + local panel = object:GetLineNumbersPanel() + if vbar then + object:SetTextOffsetX(5) + else + object:SetTextOffsetX(-5) + end + else + if vbar then + object:SetTextOffsetX(5) + else + object:SetTextOffsetX(-5) + end + end + else + object:SetTextOffsetX(5) + end + else + object:SetTextOffsetX(5) + end + + end + + textx = object:GetTextX() + texty = object:GetTextY() + + love.graphics.setFont(font) + + if alltextselected then + love.graphics.setColor(unpack(textselectedcolor)) + else + love.graphics.setColor(unpack(textnormalcolor)) + end + + if multiline then + for i=1, #lines do + love.graphics.print(lines[i], textx, texty + theight * i - theight) + end + else + love.graphics.print(lines[1], textx, texty) + end + +end + +--[[--------------------------------------------------------- + - func: DrawOverTextInput(object) + - desc: draws over the text input object +--]]--------------------------------------------------------- +function skin.DrawOverTextInput(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.textinput_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: DrawScrollButton(object) + - desc: draws the scroll button object +--]]--------------------------------------------------------- +function skin.DrawScrollButton(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local scrolltype = object:GetScrollType() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color + local bordernohovercolor = skin.controls.button_border_nohover_color + + if down then + + -- button body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height) + + elseif hover then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderhovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + else + + -- button body + love.graphics.setColor(unpack(bodynohovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + end + + if scrolltype == "up" then + local image = skin.images["arrow-up.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "down" then + local image = skin.images["arrow-down.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "left" then + local image = skin.images["arrow-left.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + elseif scrolltype == "right" then + local image = skin.images["arrow-right.png"] + if hover then + love.graphics.setColor(255, 255, 255, 255) + else + love.graphics.setColor(255, 255, 255, 150) + end + love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawSlider(object) + - desc: draws the slider object +--]]--------------------------------------------------------- +function skin.DrawSlider(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local slidtype = object:GetSlideType() + local baroutlinecolor = skin.controls.slider_bar_outline_color + local barcolor = skin.controls.slider_bar_color + + if slidtype == "horizontal" then + + love.graphics.setColor(unpack(baroutlinecolor)) + love.graphics.rectangle("fill", x, y + height/2 - 5, width, 10) + + love.graphics.setColor(unpack(barcolor)) + love.graphics.rectangle("fill", x + 5, y + height/2, width - 10, 1) + + elseif slidtype == "vertical" then + + love.graphics.setColor(unpack(baroutlinecolor)) + love.graphics.rectangle("fill", x + width/2 - 5, y, 10, height) + + love.graphics.setColor(unpack(barcolor)) + love.graphics.rectangle("fill", x + width/2, y + 5, 1, height - 10) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawSliderButton(object) + - desc: draws the slider button object +--]]--------------------------------------------------------- +function skin.DrawSliderButton(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color + local bordernohovercolor = skin.controls.button_border_down_color + + if down then + + -- button body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height) + + elseif hover then + + -- button body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(borderhovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + else + + -- button body + love.graphics.setColor(unpack(bodynohvercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- button border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawCheckBox(object) + - desc: draws the check box object +--]]--------------------------------------------------------- +function skin.DrawCheckBox(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetBoxWidth() + local height = object:GetBoxHeight() + local checked = object:GetChecked() + + love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) + skin.OutlinedRectangle(x, y, width, height) + + if checked then + love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) + love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawCollapsibleCategory(object) + - desc: draws the collapsible category object +--]]--------------------------------------------------------- +function skin.DrawCollapsibleCategory(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local bodycolor = skin.controls.collapsiblecategory_body_color + local textcolor = skin.controls.collapsiblecategory_text_color + local bordercolor = skin.controls.collapsiblecategory_border_color + local font = smallfont + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setFont(font) + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(text, x + 5, y + 5) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnList(object) + - desc: draws the column list object +--]]--------------------------------------------------------- +function skin.DrawColumnList(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlist_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListHeader(object) + - desc: draws the column list header object +--]]--------------------------------------------------------- +function skin.DrawColumnListHeader(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local down = object.down + local font = skin.controls.columnlistheader_text_font + local twidth = font:getWidth(object.name) + local theight = font:getHeight(object.name) + local bodydowncolor = skin.controls.columnlistheader_body_down_color + local textdowncolor = skin.controls.columnlistheader_text_down_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local bodyhovercolor = skin.controls.columnlistheader_body_hover_color + local textdowncolor = skin.controls.columnlistheader_text_hover_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local nohovercolor = skin.controls.columnlistheader_body_nohover_color + local textnohovercolor = skin.controls.columnlistheader_text_nohover_color + local bordernohovercolor = skin.controls.columnlistheader_border_down_color + + if down then + + -- header body + love.graphics.setColor(unpack(bodydowncolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textdowncolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + elseif hover then + + -- header body + love.graphics.setColor(unpack(bodyhovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textdowncolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(borderdowncolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + else + + -- header body + love.graphics.setColor(unpack(nohovercolor)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + -- header name + love.graphics.setFont(font) + love.graphics.setColor(unpack(textnohovercolor)) + love.graphics.print(name, x + width/2 - twidth/2, y + height/2 - theight/2) + + -- header border + love.graphics.setColor(unpack(bordernohovercolor)) + skin.OutlinedRectangle(x, y, width, height, false, false, false, true) + + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListArea(object) + - desc: draws the column list area object +--]]--------------------------------------------------------- +function skin.DrawColumnListArea(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlistarea_body_color + + love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawOverColumnListArea(object) + - desc: draws over the column list area object +--]]--------------------------------------------------------- +function skin.DrawOverColumnListArea(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.columnlist_border_color + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawColumnListRow(object) + - desc: draws the column list row object +--]]--------------------------------------------------------- +function skin.DrawColumnListRow(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local colorindex = object:GetColorIndex() + local font = object:GetFont() + local columndata = object:GetColumnData() + local textx = object:GetTextX() + local texty = object:GetTextY() + local parent = object:GetParent() + local cwidth, cheight = parent:GetParent():GetColumnSize() + local theight = font:getHeight("a") + local body1color = skin.controls.columnlistrow_body1_color + local border1color = skin.controls.columnlistrow_border1_color + local body2color = skin.controls.columnlistrow_body2_color + local border2color = skin.controls.columnlistrow_border2_color + local textcolor = skin.controls.columnlistrow_text_color + + object:SetTextPos(5, height/2 - theight/2) + + if colorindex == 1 then + + love.graphics.setColor(unpack(body1color)) + love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) + + love.graphics.setColor(unpack(skin.controls.columnlistrow_border1_color)) + skin.OutlinedRectangle(x, y, width, height, true, false, true, true) + + else + + love.graphics.setColor(unpack(body2color)) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(border2color)) + skin.OutlinedRectangle(x, y, width, height, true, false, true, true) + + end + + for k, v in ipairs(columndata) do + love.graphics.setFont(font) + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(v, x + textx, y + texty) + x = x + cwidth + end + +end + +--[[--------------------------------------------------------- + - func: skin.DrawModalBackground(object) + - desc: draws the modal background object +--]]--------------------------------------------------------- +function skin.DrawModalBackground(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.modalbackground_body_color + + love.graphics.setColor(unpack(bodycolor)) + love.graphics.rectangle("fill", x, y, width, height) + +end + +--[[--------------------------------------------------------- + - func: skin.DrawLineNumbersPanel(object) + - desc: draws the line numbers panel object +--]]--------------------------------------------------------- +function skin.DrawLineNumbersPanel(object) + + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local offsety = object:GetOffsetY() + local parent = object:GetParent() + local lines = parent:GetLines() + local font = parent:GetFont() + local theight = font:getHeight("a") + local bordercolor = skin.controls.linenumberspanel_border_color + local textcolor = skin.controls.linenumberspanel_text_color + local mody = y + + object:SetWidth(10 + font:getWidth(#lines)) + love.graphics.setFont(font) + + love.graphics.setColor(200, 200, 200, 255) + love.graphics.rectangle("fill", x, y, width, height) + + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x, y, width, height, true, true, true, false) + + for i=1, #lines do + love.graphics.setColor(unpack(textcolor)) + love.graphics.print(i, object.x + 5, mody - offsety) + mody = mody + theight + end + +end + +-- register the skin +loveframes.skins.Register(skin) \ No newline at end of file diff --git a/skins/Orange/skin.lua b/skins/Orange/skin.lua index e3e3b21..b1271cc 100644 --- a/skins/Orange/skin.lua +++ b/skins/Orange/skin.lua @@ -7,13 +7,13 @@ local skin = {} -- skin info (you always need this in a skin) -skin.name = "Orange" -skin.author = "Nikolai Resokav" +skin.name = "Orange" +skin.author = "Nikolai Resokav" skin.version = "1.0" -local smallfont = love.graphics.newFont(10) +local smallfont = love.graphics.newFont(10) local imagebuttonfont = love.graphics.newFont(15) -local bordercolor = {143, 143, 143, 255} +local bordercolor = {143, 143, 143, 255} -- controls skin.controls = {} @@ -39,7 +39,7 @@ skin.controls.button_text_font = smallfont -- image button skin.controls.imagebutton_text_down_color = {255, 255, 255, 255} -skin.controls.imagebutton_text_nohover_color = {0, 0, 0, 200} +skin.controls.imagebutton_text_nohover_color = {255, 255, 255, 200} skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255} skin.controls.imagebutton_text_font = imagebuttonfont @@ -204,60 +204,18 @@ function skin.OutlinedRectangle(x, y, width, height, ovt, ovb, ovl, ovr) end ---[[--------------------------------------------------------- - - func: DrawRepeatingImage(image, x, y, width, height) - - desc: draw a repeating image ---]]--------------------------------------------------------- -function skin.DrawRepeatingImage(image, x, y, width, height) - - local image = image - local iwidth = image:getWidth() - local iheight = image:getHeight() - local cords = {} - local posx = 0 - local posy = 0 - local stencilfunc = function() love.graphics.rectangle("fill", x, y, width, height) end - local stencil = love.graphics.newStencil(stencilfunc) - local images = 0 - - while posy < height do - - table.insert(cords, {posx, posy}) - - if posx >= width then - posx = 0 - posy = posy + iheight - else - posx = posx + iwidth - end - - end - - love.graphics.setStencil(stencil) - - for k, v in ipairs(cords) do - love.graphics.setColor(255, 255, 255, 255) - love.graphics.draw(image, x + v[1], y + v[2]) - images = images + 1 - end - - love.graphics.setStencil() - -end - --[[--------------------------------------------------------- - func: skin.DrawGradient(x, y, width, height, color) - desc: draws a gradient --]]--------------------------------------------------------- function skin.DrawGradient(x, y, width, height, color) - local color = color + local color = color local percent = 0 - local once = false - for i=1, height - 1 do + for i=1, (height - 1) do percent = i/height * 255 - color = {color[1], color[2], color[3], loveframes.util.Round(percent)} + color[4] = loveframes.util.Round(percent) love.graphics.setColor(unpack(color)) love.graphics.rectangle("fill", x, y + i, width, 1) end @@ -270,18 +228,18 @@ end --]]--------------------------------------------------------- function skin.DrawFrame(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local name = object:GetName() - local bodycolor = skin.controls.frame_body_color - local topcolor = skin.controls.frame_top_color - local bordercolor = skin.controls.frame_border_color - local namecolor = skin.controls.frame_name_color - local font = skin.controls.frame_name_font - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local bodycolor = skin.controls.frame_body_color + local topcolor = skin.controls.frame_top_color + local bordercolor = skin.controls.frame_border_color + local namecolor = skin.controls.frame_name_color + local font = skin.controls.frame_name_font + local gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3], 255} -- frame body love.graphics.setColor(unpack(bodycolor)) @@ -290,7 +248,6 @@ function skin.DrawFrame(object) -- frame top bar love.graphics.setColor(unpack(topcolor)) love.graphics.rectangle("fill", x, y, width, 25) - gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3], 255} skin.DrawGradient(x, y, width, 25, gradientcolor) love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y + 25, width, 1) @@ -312,28 +269,28 @@ end --]]--------------------------------------------------------- function skin.DrawButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local text = object:GetText() - local font = skin.controls.button_text_font - local twidth = font:getWidth(object.text) - local theight = font:getHeight(object.text) - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local textdowncolor = skin.controls.button_text_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local texthovercolor = skin.controls.button_text_hover_color - local borderhovercolor = skin.controls.button_border_down_color - local bodynohvercolor = skin.controls.button_body_nohover_color - local textnohovercolor = skin.controls.button_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local text = object:GetText() + local font = skin.controls.button_text_font + local twidth = font:getWidth(object.text) + local theight = font:getHeight(object.text) + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local textdowncolor = skin.controls.button_text_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local texthovercolor = skin.controls.button_text_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color + local textnohovercolor = skin.controls.button_text_nohover_color local bordernohovercolor = skin.controls.button_border_down_color - local gradientcolor = {} + local gradientcolor = {} - if down == true then + if down then -- button body love.graphics.setColor(unpack(bodydowncolor)) @@ -351,7 +308,7 @@ function skin.DrawButton(object) love.graphics.setColor(unpack(borderdowncolor)) skin.OutlinedRectangle(x, y, width, height) - elseif hover == true then + elseif hover then -- button body love.graphics.setColor(unpack(bodyhovercolor)) @@ -397,23 +354,22 @@ end --]]--------------------------------------------------------- function skin.DrawCloseButton(object) - local x = object:GetX() - local y = object:GetY() - local staticx = object:GetStaticX() - local width = object:GetWidth() - local height = object:GetHeight() - local parentwidth = object.parent:GetWidth() - local index = loveframes.config["ACTIVESKIN"] - local font = skin.controls.button_text_font - local twidth = font:getWidth("X") - local theight = font:getHeight("X") - local hover = object:GetHover() - local down = object.down - local image = skin.images["close.png"] - local bodydowncolor = skin.controls.closebutton_body_down_color - local bodyhovercolor = skin.controls.closebutton_body_hover_color + local x = object:GetX() + local y = object:GetY() + local staticx = object:GetStaticX() + local width = object:GetWidth() + local height = object:GetHeight() + local parentwidth = object.parent:GetWidth() + local index = loveframes.config["ACTIVESKIN"] + local font = skin.controls.button_text_font + local twidth = font:getWidth("X") + local theight = font:getHeight("X") + local hover = object:GetHover() + local down = object.down + local image = skin.images["close.png"] + local bodydowncolor = skin.controls.closebutton_body_down_color + local bodyhovercolor = skin.controls.closebutton_body_hover_color local bodynohovercolor = skin.controls.closebutton_body_nohover_color - local gradientcolor = {} if down == true then @@ -447,17 +403,17 @@ end --]]--------------------------------------------------------- function skin.DrawImage(object) - local x = object:GetX() - local y = object:GetY() + local x = object:GetX() + local y = object:GetY() local orientation = object:GetOrientation() - local scalex = object:GetScaleX() - local scaley = object:GetScaleY() - local offsetx = object:GetOffsetX() - local offsety = object:GetOffsetY() - local shearx = object:GetShearX() - local sheary = object:GetShearY() - local image = object.image - local color = object.imagecolor + local scalex = object:GetScaleX() + local scaley = object:GetScaleY() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local shearx = object:GetShearX() + local sheary = object:GetShearY() + local image = object.image + local color = object.imagecolor if color then love.graphics.setColor(unpack(color)) @@ -475,17 +431,20 @@ end --]]--------------------------------------------------------- function skin.DrawImageButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local hover = object:GetHover() - local image = object:GetImage() - local down = object.down - local font = skin.controls.imagebutton_text_font - local twidth = font:getWidth(object.text) + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local hover = object:GetHover() + local image = object:GetImage() + local down = object.down + local font = skin.controls.imagebutton_text_font + local twidth = font:getWidth(object.text) local theight = font:getHeight(object.text) + local textdowncolor = skin.controls.imagebutton_text_down_color + local texthovercolor = skin.controls.imagebutton_text_hover_color + local textnohovercolor = skin.controls.imagebutton_text_nohover_color if down then @@ -497,7 +456,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) + love.graphics.setColor(unpack(textdowncolor)) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1) elseif hover then @@ -510,7 +469,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_hover_color)) + love.graphics.setColor(unpack(texthovercolor)) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) else @@ -523,7 +482,7 @@ function skin.DrawImageButton(object) love.graphics.setFont(font) love.graphics.setColor(0, 0, 0, 255) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) - love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) + love.graphics.setColor(unpack(textnohovercolor)) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) end @@ -536,29 +495,28 @@ end --]]--------------------------------------------------------- function skin.DrawProgressBar(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local value = object:GetValue() - local max = object:GetMax() - local barwidth = object:GetBarWidth() - local font = skin.controls.progressbar_text_font - local text = value .. "/" ..max - local twidth = font:getWidth(text) - local theight = font:getHeight("a") - local bodycolor = skin.controls.progressbar_body_color - local barcolor = skin.controls.progressbar_bar_color - local textcolor = skin.controls.progressbar_text_color - local bordercolor = skin.controls.progressbar_border_color - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local value = object:GetValue() + local max = object:GetMax() + local barwidth = object:GetBarWidth() + local font = skin.controls.progressbar_text_font + local text = value .. "/" ..max + local twidth = font:getWidth(text) + local theight = font:getHeight("a") + local bodycolor = skin.controls.progressbar_body_color + local barcolor = skin.controls.progressbar_bar_color + local textcolor = skin.controls.progressbar_text_color + local bordercolor = skin.controls.progressbar_border_color + local gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255} -- progress bar body love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) love.graphics.setColor(unpack(barcolor)) love.graphics.rectangle("fill", x, y, barwidth, height) - gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255} skin.DrawGradient(x, y, barwidth, height, gradientcolor) love.graphics.setFont(font) love.graphics.setColor(unpack(textcolor)) @@ -576,13 +534,13 @@ end --]]--------------------------------------------------------- function skin.DrawScrollArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bartype = object:GetBarType() - local bodycolor = skin.controls.scrollarea_body_color - local bordercolor = skin.controls.scrollarea_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bartype = object:GetBarType() + local bodycolor = skin.controls.scrollarea_body_color + local bordercolor = skin.controls.scrollarea_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -602,20 +560,20 @@ end --]]--------------------------------------------------------- function skin.DrawScrollBar(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local dragging = object:IsDragging() - local hover = object:GetHover() - local bartype = object:GetBarType() - local bodydowncolor = skin.controls.scrollbar_body_down_color - local borderdowncolor = skin.controls.scrollbar_border_down_color - local bodyhovercolor = skin.controls.scrollbar_body_hover_color - local borderhovercolor = skin.controls.scrollbar_border_hover_color - local bodynohvercolor = skin.controls.scrollbar_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local dragging = object:IsDragging() + local hover = object:GetHover() + local bartype = object:GetBarType() + local bodydowncolor = skin.controls.scrollbar_body_down_color + local borderdowncolor = skin.controls.scrollbar_border_down_color + local bodyhovercolor = skin.controls.scrollbar_body_hover_color + local borderhovercolor = skin.controls.scrollbar_border_hover_color + local bodynohvercolor = skin.controls.scrollbar_body_nohover_color local bordernohovercolor = skin.controls.scrollbar_border_nohover_color - local gradientcolor = {} + local gradientcolor = {} if dragging then love.graphics.setColor(unpack(bodydowncolor)) @@ -660,11 +618,11 @@ end --]]--------------------------------------------------------- function skin.DrawScrollBody(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.scrollbody_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.scrollbody_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -677,12 +635,12 @@ end --]]--------------------------------------------------------- function skin.DrawPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.panel_body_color - local bordercolor = skin.controls.panel_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.panel_body_color + local bordercolor = skin.controls.panel_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -697,11 +655,11 @@ end --]]--------------------------------------------------------- function skin.DrawList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.list_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.list_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -714,11 +672,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordrcolor = skin.controls.list_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordrcolor = skin.controls.list_border_color love.graphics.setColor(unpack(bordrcolor)) skin.OutlinedRectangle(x, y, width, height) @@ -731,13 +689,13 @@ end --]]--------------------------------------------------------- function skin.DrawTabPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local buttonheight = object:GetHeightOfButtons() - local bodycolor = skin.controls.tabpanel_body_color - local bordercolor = skin.controls.tabpanel_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local buttonheight = object:GetHeightOfButtons() + local bodycolor = skin.controls.tabpanel_body_color + local bordercolor = skin.controls.tabpanel_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y + buttonheight, width, height - buttonheight) @@ -754,27 +712,25 @@ end --]]--------------------------------------------------------- function skin.DrawTabButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local text = object:GetText() - local image = object:GetImage() - local tabnumber = object:GetTabNumber() - local parent = object:GetParent() - local ptabnumber = parent:GetTabNumber() - local font = skin.controls.tab_text_font - local twidth = font:getWidth(object.text) - local theight = font:getHeight(object.text) - local imagewidth = 0 - local imageheight = 0 - local bordercolor = skin.controls.tabpanel_border_color - local bodyhovercolor = skin.controls.button_body_hover_color - local texthovercolor = skin.controls.button_text_hover_color - local bodynohovercolor = skin.controls.button_body_nohover_color - local textnohovercolor = skin.controls.button_text_nohover_color - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local hover = object:GetHover() + local text = object:GetText() + local image = object:GetImage() + local tabnumber = object:GetTabNumber() + local parent = object:GetParent() + local ptabnumber = parent:GetTabNumber() + local font = skin.controls.tab_text_font + local twidth = font:getWidth(object.text) + local theight = font:getHeight(object.text) + local imagewidth = 0 + local imageheight = 0 + local bordercolor = skin.controls.tabpanel_border_color + local bodyhovercolor = skin.controls.button_body_hover_color + local texthovercolor = skin.controls.button_text_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color + local textnohovercolor = skin.controls.button_text_nohover_color + local gradientcolor = {} if image then imagewidth = image:getWidth() @@ -793,6 +749,9 @@ function skin.DrawTabButton(object) object.height = theight + 5 end + local width = object:GetWidth() + local height = object:GetHeight() + if tabnumber == ptabnumber then -- button body @@ -857,18 +816,18 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoice(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local choice = object:GetChoice() - local image = skin.images["multichoice-arrow.png"] - local font = skin.controls.multichoice_text_font - local theight = font:getHeight("a") - local bodycolor = skin.controls.multichoice_body_color - local textcolor = skin.controls.multichoice_text_color - local bordercolor = skin.controls.multichoice_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local choice = object:GetChoice() + local image = skin.images["multichoice-arrow.png"] + local font = skin.controls.multichoice_text_font + local theight = font:getHeight("a") + local bodycolor = skin.controls.multichoice_body_color + local textcolor = skin.controls.multichoice_text_color + local bordercolor = skin.controls.multichoice_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x + 1, y + 1, width - 2, height - 2) @@ -896,11 +855,11 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoiceList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.multichoicelist_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.multichoicelist_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -913,11 +872,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverMultiChoiceList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.multichoicelist_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.multichoicelist_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y - 1, width, height + 1) @@ -930,20 +889,20 @@ end --]]--------------------------------------------------------- function skin.DrawMultiChoiceRow(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local font = skin.controls.multichoicerow_text_font - local bodyhovecolor = skin.controls.multichoicerow_body_hover_color - local texthovercolor = skin.controls.multichoicerow_text_hover_color - local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color - local textnohovercolor = skin.controls.multichoicerow_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local font = skin.controls.multichoicerow_text_font + local bodyhovecolor = skin.controls.multichoicerow_body_hover_color + local texthovercolor = skin.controls.multichoicerow_text_hover_color + local bodynohovercolor = skin.controls.multichoicerow_body_nohover_color + local textnohovercolor = skin.controls.multichoicerow_text_nohover_color love.graphics.setFont(font) - if object.hover == true then + if object.hover then love.graphics.setColor(unpack(bodyhovecolor)) love.graphics.rectangle("fill", x, y, width, height) love.graphics.setColor(unpack(texthovercolor)) @@ -963,12 +922,12 @@ end --]]--------------------------------------------------------- function skin.DrawToolTip(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.tooltip_body_color - local bordercolor = skin.controls.tooltip_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.tooltip_body_color + local bordercolor = skin.controls.tooltip_border_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -991,33 +950,33 @@ end --]]--------------------------------------------------------- function skin.DrawTextInput(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local font = object:GetFont() - local focus = object:GetFocus() - local showindicator = object:GetIndicatorVisibility() - local alltextselected = object:IsAllTextSelected() - local textx = object:GetTextX() - local texty = object:GetTextY() - local text = object:GetText() - local multiline = object:GetMultiLine() - local lines = object:GetLines() - local offsetx = object:GetOffsetX() - local offsety = object:GetOffsetY() - local indicatorx = object:GetIndicatorX() - local indicatory = object:GetIndicatorY() - local vbar = object:HasVerticalScrollBar() - local hbar = object:HasHorizontalScrollBar() - local linenumbers = object:GetLineNumbersEnabled() - local itemwidth = object:GetItemWidth() - local theight = font:getHeight("a") - local bodycolor = skin.controls.textinput_body_color - local textnormalcolor = skin.controls.textinput_text_normal_color - local textselectedcolor = skin.controls.textinput_text_selected_color - local highlightbarcolor = skin.controls.textinput_highlight_bar_color - local indicatorcolor = skin.controls.textinput_indicator_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local font = object:GetFont() + local focus = object:GetFocus() + local showindicator = object:GetIndicatorVisibility() + local alltextselected = object:IsAllTextSelected() + local textx = object:GetTextX() + local texty = object:GetTextY() + local text = object:GetText() + local multiline = object:GetMultiLine() + local lines = object:GetLines() + local offsetx = object:GetOffsetX() + local offsety = object:GetOffsetY() + local indicatorx = object:GetIndicatorX() + local indicatory = object:GetIndicatorY() + local vbar = object:HasVerticalScrollBar() + local hbar = object:HasHorizontalScrollBar() + local linenumbers = object:GetLineNumbersEnabled() + local itemwidth = object:GetItemWidth() + local theight = font:getHeight("a") + local bodycolor = skin.controls.textinput_body_color + local textnormalcolor = skin.controls.textinput_text_normal_color + local textselectedcolor = skin.controls.textinput_text_selected_color + local highlightbarcolor = skin.controls.textinput_highlight_bar_color + local indicatorcolor = skin.controls.textinput_indicator_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1117,11 +1076,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverTextInput(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.textinput_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.textinput_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) @@ -1134,20 +1093,20 @@ end --]]--------------------------------------------------------- function skin.DrawScrollButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local scrolltype = object:GetScrollType() - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local borderhovercolor = skin.controls.button_border_hover_color - local bodynohovercolor = skin.controls.button_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local scrolltype = object:GetScrollType() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_hover_color + local bodynohovercolor = skin.controls.button_body_nohover_color local bordernohovercolor = skin.controls.button_border_nohover_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1192,36 +1151,44 @@ function skin.DrawScrollButton(object) if scrolltype == "up" then local image = skin.images["arrow-up.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "down" then local image = skin.images["arrow-down.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "left" then local image = skin.images["arrow-left.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) elseif scrolltype == "right" then local image = skin.images["arrow-right.png"] + local imagewidth = image:getWidth() + local imageheight = image:getHeight() if hover then love.graphics.setColor(255, 255, 255, 255) else love.graphics.setColor(255, 255, 255, 150) end - love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) + love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2) end end @@ -1232,13 +1199,13 @@ end --]]--------------------------------------------------------- function skin.DrawSlider(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local slidtype = object:GetSlideType() - local baroutlinecolor = skin.controls.slider_bar_outline_color - local barcolor = skin.controls.slider_bar_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local slidtype = object:GetSlideType() + local baroutlinecolor = skin.controls.slider_bar_outline_color + local barcolor = skin.controls.slider_bar_color if slidtype == "horizontal" then @@ -1266,19 +1233,19 @@ end --]]--------------------------------------------------------- function skin.DrawSliderButton(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local down = object.down - local bodydowncolor = skin.controls.button_body_down_color - local borderdowncolor = skin.controls.button_border_down_color - local bodyhovercolor = skin.controls.button_body_hover_color - local borderhovercolor = skin.controls.button_border_down_color - local bodynohvercolor = skin.controls.button_body_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local down = object.down + local bodydowncolor = skin.controls.button_body_down_color + local borderdowncolor = skin.controls.button_border_down_color + local bodyhovercolor = skin.controls.button_body_hover_color + local borderhovercolor = skin.controls.button_border_down_color + local bodynohvercolor = skin.controls.button_body_nohover_color local bordernohovercolor = skin.controls.button_border_down_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1329,24 +1296,32 @@ end --]]--------------------------------------------------------- function skin.DrawCheckBox(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetBoxWidth() - local height = object:GetBoxHeight() - local checked = object:GetChecked() - local gradientcolor = {} + local x = object:GetX() + local y = object:GetY() + local width = object:GetBoxWidth() + local height = object:GetBoxHeight() + local checked = object:GetChecked() + local hover = object:GetHover() + local bodycolor = skin.controls.checkbox_body_color + local bordercolor = skin.controls.checkbox_border_color + local checkcolor = skin.controls.checkbox_check_color - love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) + love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) - love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) + love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) if checked then - love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) + love.graphics.setColor(unpack(checkcolor)) love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) end + if hover then + love.graphics.setColor(unpack(bordercolor)) + skin.OutlinedRectangle(x + 4, y + 4, width - 8, height - 8) + end + end --[[--------------------------------------------------------- @@ -1355,16 +1330,16 @@ end --]]--------------------------------------------------------- function skin.DrawCollapsibleCategory(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local text = object:GetText() - local bodycolor = skin.controls.collapsiblecategory_body_color - local textcolor = skin.controls.collapsiblecategory_text_color - local bordercolor = skin.controls.collapsiblecategory_border_color - local font = smallfont - local gradientcolor = {bodycolor[1] - 20, bodycolor[2] - 20, bodycolor[3] - 20, 255} + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local text = object:GetText() + local bodycolor = skin.controls.collapsiblecategory_body_color + local textcolor = skin.controls.collapsiblecategory_text_color + local bordercolor = skin.controls.collapsiblecategory_border_color + local font = smallfont + local gradientcolor = {bodycolor[1] - 20, bodycolor[2] - 20, bodycolor[3] - 20, 255} love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1387,11 +1362,11 @@ end --]]--------------------------------------------------------- function skin.DrawColumnList(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.columnlist_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlist_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1404,26 +1379,26 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListHeader(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local hover = object:GetHover() - local name = object:GetName() - local down = object.down - local font = skin.controls.columnlistheader_text_font - local twidth = font:getWidth(object.name) - local theight = font:getHeight(object.name) - local bodydowncolor = skin.controls.columnlistheader_body_down_color - local textdowncolor = skin.controls.columnlistheader_text_down_color - local borderdowncolor = skin.controls.columnlistheader_border_down_color - local bodyhovercolor = skin.controls.columnlistheader_body_hover_color - local textdowncolor = skin.controls.columnlistheader_text_hover_color - local borderdowncolor = skin.controls.columnlistheader_border_down_color - local nohovercolor = skin.controls.columnlistheader_body_nohover_color - local textnohovercolor = skin.controls.columnlistheader_text_nohover_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local hover = object:GetHover() + local name = object:GetName() + local down = object.down + local font = skin.controls.columnlistheader_text_font + local twidth = font:getWidth(object.name) + local theight = font:getHeight(object.name) + local bodydowncolor = skin.controls.columnlistheader_body_down_color + local textdowncolor = skin.controls.columnlistheader_text_down_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local bodyhovercolor = skin.controls.columnlistheader_body_hover_color + local textdowncolor = skin.controls.columnlistheader_text_hover_color + local borderdowncolor = skin.controls.columnlistheader_border_down_color + local nohovercolor = skin.controls.columnlistheader_body_nohover_color + local textnohovercolor = skin.controls.columnlistheader_text_nohover_color local bordernohovercolor = skin.controls.columnlistheader_border_down_color - local gradientcolor = {} + local gradientcolor = {} if down then @@ -1489,13 +1464,13 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.columnlistarea_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.columnlistarea_body_color - love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) + love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) end @@ -1506,11 +1481,11 @@ end --]]--------------------------------------------------------- function skin.DrawOverColumnListArea(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bordercolor = skin.controls.columnlist_border_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bordercolor = skin.controls.columnlist_border_color love.graphics.setColor(unpack(bordercolor)) skin.OutlinedRectangle(x, y, width, height) @@ -1523,23 +1498,23 @@ end --]]--------------------------------------------------------- function skin.DrawColumnListRow(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local colorindex = object:GetColorIndex() - local font = object:GetFont() - local columndata = object:GetColumnData() - local textx = object:GetTextX() - local texty = object:GetTextY() - local parent = object:GetParent() - local cwidth, cheight = parent:GetParent():GetColumnSize() - local theight = font:getHeight("a") - local body1color = skin.controls.columnlistrow_body1_color - local border1color = skin.controls.columnlistrow_border1_color - local body2color = skin.controls.columnlistrow_body2_color - local border2color = skin.controls.columnlistrow_border2_color - local textcolor = skin.controls.columnlistrow_text_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local colorindex = object:GetColorIndex() + local font = object:GetFont() + local columndata = object:GetColumnData() + local textx = object:GetTextX() + local texty = object:GetTextY() + local parent = object:GetParent() + local cwidth, cheight = parent:GetParent():GetColumnSize() + local theight = font:getHeight("a") + local body1color = skin.controls.columnlistrow_body1_color + local border1color = skin.controls.columnlistrow_border1_color + local body2color = skin.controls.columnlistrow_body2_color + local border2color = skin.controls.columnlistrow_border2_color + local textcolor = skin.controls.columnlistrow_text_color object:SetTextPos(5, height/2 - theight/2) @@ -1576,11 +1551,11 @@ end --]]--------------------------------------------------------- function skin.DrawModalBackground(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local bodycolor = skin.controls.modalbackground_body_color + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local bodycolor = skin.controls.modalbackground_body_color love.graphics.setColor(unpack(bodycolor)) love.graphics.rectangle("fill", x, y, width, height) @@ -1593,18 +1568,18 @@ end --]]--------------------------------------------------------- function skin.DrawLineNumbersPanel(object) - local x = object:GetX() - local y = object:GetY() - local width = object:GetWidth() - local height = object:GetHeight() - local offsety = object:GetOffsetY() - local parent = object:GetParent() - local lines = parent:GetLines() - local font = parent:GetFont() - local theight = font:getHeight("a") - local bordercolor = skin.controls.linenumberspanel_border_color - local textcolor = skin.controls.linenumberspanel_text_color - local mody = y + local x = object:GetX() + local y = object:GetY() + local width = object:GetWidth() + local height = object:GetHeight() + local offsety = object:GetOffsetY() + local parent = object:GetParent() + local lines = parent:GetLines() + local font = parent:GetFont() + local theight = font:getHeight("a") + local bordercolor = skin.controls.linenumberspanel_border_color + local textcolor = skin.controls.linenumberspanel_text_color + local mody = y object:SetWidth(10 + font:getWidth(#lines)) love.graphics.setFont(font)