This commit is contained in:
mkwong98 2018-12-15 19:20:50 +08:00
parent 08f0cf7fe3
commit 8c5b494f7b
5 changed files with 494 additions and 449 deletions

View file

@ -3360,7 +3360,7 @@
<wx/image.h>
<SDL2/SDL.h>
1539751409 source:c:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
1544871692 source:c:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
"hdnesPackEditormainForm.h"
"hdnesPackEditornewProjectDialog.h"
"hdnesPackEditorcolourSelectDialog.h"
@ -3453,10 +3453,10 @@
<wx\wx.h>
<SDL2\SDL.h>
1530359667 source:c:\work\hdnes\trunk\hdnespackeditor\mainform.cpp
1544871682 source:c:\work\hdnes\trunk\hdnespackeditor\mainform.cpp
"mainForm.h"
1539750345 source:c:\work\hdnes\trunk\hdnespackeditor\condition.cpp
1539751671 source:c:\work\hdnes\trunk\hdnespackeditor\condition.cpp
"condition.h"
"coreData.h"
"gameTile.h"

View file

@ -13906,7 +13906,7 @@
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="maxlength">8</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>

File diff suppressed because it is too large Load diff

View file

@ -361,7 +361,13 @@ void hdnesPackEditormainForm::refreshCoreDataDisplay(){
}
void hdnesPackEditormainForm::refreshROMView(){
if(romViewColours[0] >= 64) romViewColours[0] = 0x0f;
if(romViewColours[1] >= 64) romViewColours[1] = 0x0f;
if(romViewColours[2] >= 64) romViewColours[2] = 0x0f;
if(romViewColours[3] >= 64) romViewColours[3] = 0x0f;
btnRomViewBGColour->SetBackgroundColour(coreData::cData->palette[romViewColours[0]]);
if(coreData::cData->palette[romViewColours[0]].Red() + coreData::cData->palette[romViewColours[0]].Green() + coreData::cData->palette[romViewColours[0]].Blue() > 256){
btnRomViewBGColour->SetForegroundColour(wxColour(0,0,0));
}

View file

@ -949,6 +949,7 @@ mainForm::mainForm( wxWindow* parent, wxWindowID id, const wxString& title, cons
bSizer7->Add( btnRomViewColour3, 0, wxALIGN_CENTER_VERTICAL, 5 );
txtRomViewPalette = new wxTextCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
txtRomViewPalette->SetMaxLength( 8 );
bSizer7->Add( txtRomViewPalette, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );