lots of changes

Visual Novel/GuiManager/Core/Colors.lua

@@ -36,12 +36,12 @@ new=function(r,b,g)
 		__unm = function (c1)
 			return Color.new(-c1[1],-c1[2],-c1[2])
 		end,
-		__tostring = function(c)
-			return "("..c[1]..","..c[2]..","..c[3]..")"
-		end,
 		__eq = Color.EQ,
 		__lt = Color.LT,
 		__le = Color.LE,
+		__tostring = function(self)
+			return "("..self[1] ..","..self[1] ..","..self[1] ..")"
+		end
 	}
 	local temp = {r/255,b/255,g/255,1}
 	setmetatable(temp, mt)
@@ -63,23 +63,27 @@ IndexColor=function(name,r,b,g)
 	if type(r)=="string" then
 		r,b,g=tonumber(string.sub(r,1,2),16),tonumber(string.sub(r,3,4),16),tonumber(string.sub(r,5,6),16)
 	end
-	Color[string.lower(name)]=Color.new(r,b,g)
-	Color[string.upper(name)]=Color.new(r,b,g)
-	Color[string.upper(string.sub(name,1,1))..string.lower(string.sub(name,2))]=Color.new(r,b,g)
+	_Color[string.lower(name)]=Color.new(r,b,g)
+	_Color[string.upper(name)]=Color.new(r,b,g)
+	_Color[string.upper(string.sub(name,1,1))..string.lower(string.sub(name,2))]=Color.new(r,b,g)
 end,
 Darken=function(color,v)
-	currentR=color[1]
-	currentG=color[2]
-	currentB=color[3]
-	return Color.new((currentR*255) * (1 - v),(currentG*255) * (1 - v),(currentB*255) * (1 - v))
+	return Color.new((color[1]*255) * (1 - v),(color[2]*255) * (1 - v),(color[3]*255) * (1 - v))
 end,
 Lighten=function(color,v)
 	currentR=color[1]
 	currentG=color[2]
 	currentB=color[3]
-	return Color.new(currentR*255 + (255 - (currentR*255)) * v,currentG*255 + (255 - (currentG*255)) * v,currentB*255 + (255 - (currentB*255)) * v)
+	return Color.new(color[1]*255 + (255 - (color[1]*255)) * v,color[2]*255 + (255 - (color[2]*255)) * v,color[3]*255 + (255 - (color[3]*255)) * v)
 end
 }
+_Color = {}
+setmetatable(Color,{
+	__index = function(self,k)
+		local c = _Color[k]
+		return Color.new(c[1]*255,c[2]*255,c[3]*255)
+	end,
+})
 Color.IndexColor("Black",20,20,20)
 Color.IndexColor("WHITE",255,255,255)
 Color.IndexColor("MAROON",128,20,20)

Visual Novel/GuiManager/Core/canPress.lua

@@ -54,8 +54,11 @@ function gui:Clickable()
 	if not(x) then
 		return true
 	end
+	if self.isclipped then
 		return not(mx>x+w or mx<x or my>y+h or my<y)
 	end
+	return true
+end
 function gui:canPress()
 	local ref = self
 	if self.ClipReference then ref = self.ClipReference end

Visual Novel/GuiManager/Drawing/drawR.lua

@@ -17,13 +17,16 @@ function gui:drawR()
 		self.height=(self.Parent.height*self.scale.size.y)+self.offset.size.y
 		local b=true
 		for i,v in pairs(_GuiPro.Clips) do
-			if self:isDescendant(v)==true then
+			if self:isDescendant(v) then
 				b=false
 			end
 		end
-		if b==true then
+		self.isclipped = false
+		if b then
 			love.graphics.setStencilTest()
 			love.graphics.setScissor()
+		else
+			self.isclipped = true
 		end
 		if self.DrawRulesB then
 			for dr=1,#self.DrawRulesB do
@@ -54,21 +57,17 @@ function gui:drawR()
 			love.graphics.rectangle("line", self.x-(b/2), self.y-(b/2), self.width+b, self.height+b,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI)
 		end
 		if string.find(self.Type, "Text") then
-			if self.text~=nil and self.TextFormat == "center" then
 			love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility)
 			love.graphics.setFont(self.Font)
+			if self.text~=nil and self.TextFormat == "center" then
 				love.graphics.printf(self.text, self.x+(self.width-self.Font:getWidth(self.text))/2, self.y+(self.height-self.Font:getHeight())/2, self.width, "left",self.TextRotaion)
 			elseif self.text~=nil and self.TextFormat == "middleleft" then
-				love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility)
-				love.graphics.setFont(self.Font)
 				love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y+(self.height-self.Font:getHeight())/2, self.width, "left",self.TextRotaion)
 			elseif self.text~=nil and self.TextFormat == "middleright" then
-				love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility)
-				love.graphics.setFont(self.Font)
 				love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y+(self.height-self.Font:getHeight())/2, self.width, "right",self.TextRotaion)
+			elseif self.text~=nil and self.TextFormat == "middlecenter" then
+				love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y+(self.height-self.Font:getHeight())/2, self.width, "center",self.TextRotaion)
 			else
-				love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility)
-				love.graphics.setFont(self.Font)
 				love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y, self.width, self.TextFormat,self.TextRotaion)
 			end
 		end

Visual Novel/GuiManager/Image-Animation/newImageButton.lua

@@ -5,10 +5,11 @@ function gui:newImageButton(i,name, x, y, w, h, sx ,sy ,sw ,sh)
 	c.Visibility=0
 	c.ImageVisibility=1
 	c.rotation=0
-	c:OnEnter(function()
+	c.BorderSize = 0
+	c:OnMouseEnter(function()
 		love.mouse.setCursor(_GuiPro.CursorH)
 	end)
-	c:OnExit(function()
+	c:OnMouseExit(function()
 		love.mouse.setCursor(_GuiPro.CursorN)
 	end)
     return c

Visual Novel/GuiManager/Image-Animation/newImageLabel.lua

@@ -6,5 +6,6 @@ function gui:newImageLabel(i,name, x, y, w, h, sx ,sy ,sw ,sh)
 	c.Visibility=0
 	c.ImageVisibility=1
 	c.rotation=0
+	c.BorderSize = 0
 	return c
 end

Visual Novel/GuiManager/Misc/newScrollMenu.lua

@@ -1,4 +1,4 @@
-function gui:newScrollMenu(name)
+function gui:newScrollMenu(name,SC,MC)
 	local temp = self:newFullFrame(name)
 	temp.ref = {
 		[[setNewFont(16)]],
@@ -9,10 +9,13 @@ function gui:newScrollMenu(name)
 	temp.Visibility = 0
 	local ScrollY = temp:newFrame(name.."ScrollY",-20,0,20,0,1,0,0,1)
 	temp.scroll = ScrollY
-	ScrollY.Color=Color.new(80,80,80)
+	local cc = self.Color
+	local c1,c2=Color.new(cc[1]*255,cc[2]*255,cc[3]*255),Color.new(cc[1]*255+20,cc[2]*255+20,cc[3]*255+20)
+	print(cc[1]-20,cc[2]-20,cc[3]-20)
+	ScrollY.Color=SC or c1
 	ScrollY.allowOverlapping = true
 	ScrollY.Mover = ScrollY:newFrame(name.."MoverY",5,5,10,80)
-	ScrollY.Mover.Color = Color.new(60,60,60)
+	ScrollY.Mover.Color = MC or c2
 	local func = function(b,self,x,y,nn)
 		temp.symbolicY = y
 		if y>45 and y<self.height-45 then
@@ -65,17 +68,29 @@ function gui:newScrollMenu(name)
 		local height = height or 30
 		temp.max = temp.max + padding-- + height
 		if obj then
-			obj:SetDualDim(nil,temp.max-padding,nil,height,nil,nil,1)
+			obj:SetDualDim(0,temp.max-padding+padding,0,height,0,0,1)
 			obj:setParent(self.first)
 		end
-		local c = obj or self.first:newTextLabel(text,text,0,temp.max-padding,0,height,0,0,1)
+		local c = obj or self.first:newTextLabel(text,text,0,temp.max-padding+padding,0,height,0,0,1)
 		if not obj then
 			c:Mutate(temp.ref)
 		end
+		c.adjustment = padding + height
 		temp.max = temp.max + height
 		c.staticpos = temp.max
+		c.LID = #temp.list
 		temp.list[#temp.list+1] = c
 		return c
 	end
+	function temp:removeItem(obj)
+		local id = obj.LID
+		if not id then error("GUI object is not part of this menu!") end
+		self.max = self.max - obj.adjustment
+		local adj = obj.adjustment
+		obj:Destroy()
+		for i = id+1,#self.list do
+			self.list[i]:setDualDim(nil,self.list[i].offset.pos.y-adj)
+		end
+	end
 	return temp
 end