diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache index 6d3ee815e64a68d41d0d938dd329345f596bfd94..7dcce0e548e46b90764d6354561e1e2dd771f572 GIT binary patch literal 137 zc$^FHc6a1rU|`6Y`Lft-vc#^t2G_eM*SatqnQarhm({N558oPxa1XnEtqg<#BM{5z ihZd(673(MFR2J*&<&~zVmgpBGCTAz6rxxqu(+mI~z8cH` diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index beb065221b775b0923aac8664ca422edae6e5b6c..d51495191593be3acd715d442b1d9e9bcdc6b3f8 GIT binary patch literal 7400 zc%1E7Yiu0V6`q-W&N|5^0YU-^*ffNM*fVzGbs&jF9VZ4iw&Qr+1Y#WL?(SXh#q-$C z%-Yz2Jeo+M{n1nekcg;M3HTGlQ%G(9kt(X%Up&-QMWRwGfk>-JEk8?z;GFTydUj`r z#9@$%#8^IeX3o9e{m!}Po;fqi@f^o}2?w@#ED=B)9%Ok#H}#?=?W!=PAdM1p%9MI_ zgSIvwpoYnGt-B*5bx7?}duwxVMX@Rd?bc|;GKkXJJY2~sEWek|j_OlX>&~@rEoO?_ ziX9z=Ogq_1VmMh#<2kakrbX4PMJ$TF#3ECueHB?duL2f|Lh}|-Fr|lxS+Yn@p~zZ{ zfQX{_+OBcvkQ&fQp^xM(-AFk0Gy&aST`d!X8cFP&WpgwNH_i9~qEx8KaS<*SYf7$i z!1oyirV*t&=IZ|Y9(WRIL_w^;lNbt|E{eAT#-Wu>6Kqlg=k^klay-8r2R6ZfJOQF0 z53rm;j9IzQAS#{FjVV(e)HPiyy4SK}gDH1O9b2S!Sz$R@g)VZZlxZVnCOdPFR5XjJ zRLW9=5rxeW^o>+dlz0+mDup;x|2_#VG^mN)r9NE7c@54c!fe~+ADaLs6J^$v4O-Ss znVGsuEraFTz%^5CMUBXPLp^eiY4UEGt4!jRJw65FvmvtGO)O#qqt{151b$dmY}_S) zdoX0&0jB-L244!`Lm`4A<}$z>4g*s)^SS|dZPYZN9td;Y3^K#CNgI24$T5N0&IVo) z^4bkmRM>ub6Tz3qovkjeL~#>}n^D|?Vik&8QLIL>2E}bCZbz{eL=1;*zGf=j+~=lI z%qS66FGS&gN+4RaK+9&_#58Nh3~QPiLQ#W^B?tm1CR^)~vn9w`1*yk0shU$}hrsqd zk6Tnj!!ZZ*D7a7G`19rSe@)s6d>y9SREp!#ww3kTI~;B7=0)0(x*j`XMGY1uTGaXr z@uE6x=ta!MU|EFcZ@@TdF$2cNZGS9t7TpOB+dad|N5ii=4!9FVv+V_5Y{8s=7l@_O z(4Nt1q{V-Lqxf4IIdHw}-c^mXce~nK8)-MV+SQG;_qf_MjkFtG?QM;;n_TVfjkNc= z+O>_eo86GW$XV1HAylkH%$}jB2KR;XRHQs*MIaVpMTJb7iF~<2jC=|E^!5vRmVlE| zk1{Dj7yEf^CG&cL=HM}$n4+^~!i*R(vzC!yW)`PP;mC5O2S7xosujDSNE%cn0L#$t0i5R5OfLWRn$R{weI3#Hd-d?xA^ly1}fHy7PKRIWx^0 z#Bxkw)-2E4JCl#Mddj1Q)qvQBiy)zpafDMB^2f1`c@HYZ8)J_+iD@jPCMGy6Hn`}! z0QSv{s=?&#xQTCpX5#A%T&Q3>v3$L*0(RRrlF4VfI_}@vN!#zcA7|n*b*-~~x)o&e zwdx+R6J44?(N*tP{!icv^sRm8k8tv?Q<8&0I9vW&=wTUkXVs|f7{^d=i93+;P88kT z!ZFYL_g>x?YkB_=njHYJKy6FA)OCH_w2Go2N}`!_e1*{)U3A74dr<7cv6x%y_99m0 z@rgn5m~KGBG;C~Kabko{Gwg!XC*i=Z7`0zI2fx1Rs9umwo;p(8jdSin(dS#}-+3MO z+ggY9Lo?(73TsX8u2TIGUN2OT;$9>L56Bf}8RigVrrt3;w zaRiBGQH=W7zT#zjp_c7IXh!P5!lHanmGZ+FOwLw+1W6u3G3I0Xl9%a=wM-8~(;x1J z-dH6#fg$Wx@B`lJgsw9h^UFsC~;v}*xp+5Py&AY#f8brfYE+p}J_zo=zvdUk*9hn8>V+s##~ zmSEa&g&Onfi52PyyWQTJiq<6Y!e7DmX-&o?F&P$Glzk)G*etpMkU}2#K zwjbL3|4#}0Hs9dG;Dc1d=(Rr(W~p_gV{B|O4sUJ#c0ZPmj~{iSn2$ffc~W>vw7)hU z^Mv61wms==+vo|nI8n20@vT`ri6OG<`@s4>u&ROeQ?6RPq{LGgB&U60b<`VHbN;Y8 zg9&qYVAkE^%es9*S$A(B$bb)IFbHHM5G3mZ84Ut?BoO3~4`eI|)>9r64^P+V6Li)8Ymj3g~7mr;%d**+U zY30D1cFTaKxTqKp7eD+7SJ_@ z>GQj}-!XlFR%>=y93eR$)k=}#HU>Sb-WN)FQ?twI3aQ@K~DvAk8;@1>D*L`Tzg` diff --git a/isometric-park-fna/BudgetWindow.cs b/isometric-park-fna/BudgetWindow.cs --- a/isometric-park-fna/BudgetWindow.cs +++ b/isometric-park-fna/BudgetWindow.cs @@ -26,11 +26,19 @@ this.y = start_y; } - public void update(MouseState mouseCur, Budget budget) + public bool update(MouseState mouseCur, Budget budget) { this.budget = budget; if ((mouseCur.LeftButton == ButtonState.Pressed) + && MathUtils.Between(mouseCur.X, 700+x-40, 700+x) + // && MathUtils.Between(mouseCur.Y, 500+y-20, 500 + y) + ) { + + return false; + + } + else if ((mouseCur.LeftButton == ButtonState.Pressed) && MathUtils.Between(mouseCur.X, x, 700+x) && MathUtils.Between(mouseCur.Y, y, 500 + y)) { @@ -46,14 +54,15 @@ this.y = MathUtils.Clamp(this.y + (int)(this.mouseEnd.Y - this.mouseStart.Y), 0, 400); } } - else if (mousePrev.LeftButton == ButtonState.Pressed) - { - } - this.mouseStart = new Vector2(mouseCur.X, mouseCur.Y); + this.mouseStart = new Vector2(mouseCur.X, mouseCur.Y); this.mousePrev = mouseCur; + // Console.Write(mouseCur.ToString()); + + return true; + } public void draw(SpriteBatch batch) @@ -83,9 +92,12 @@ } } + FilledRectangle.drawFilledRectangle(batch, new Rectangle(x + 700 - 20, y+bar_height, 20, 20), Color.LightGray); + Vector2 dimensions = font.MeasureString("X"); + batch.DrawString(font, "X", new Vector2(x+700 -20 + (dimensions.X/2), y+bar_height), Color.Black); + batch.DrawString(font, String.Format("BUDGET REPORT FOR {0:MMMMM yyyy}", this.budget.DateTime), new Vector2(x, bar_height * 1 + y), Color.Black); - batch.DrawString(font, String.Format("Starting Funds.........${0:}", this.budget.money), new Vector2(x, bar_height * 2 + y), Color.Black); batch.DrawString(font, String.Format("REVENUE", this.budget.upkeep), new Vector2(x, bar_height * 4 + y), Color.Black); diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -411,7 +411,7 @@ if (this.showBudget) { - this.budgetWindow.update(mouseCur, this.simulation.latestBudget); + this.showBudget = this.budgetWindow.update(mouseCur, this.simulation.latestBudget); }