Ivan Safrin 12 лет назад
Родитель
Сommit
0190973e32

+ 2 - 2
Modules/Contents/UI/Include/PolyUICheckBox.h

@@ -46,7 +46,7 @@ namespace Polycode {
 		private:
 			bool checked;
 			SceneLabel *captionLabel;
-			SceneImage *buttonImageChecked;
-			SceneImage *buttonImageUnchecked;			
+			UIImage *buttonImageChecked;
+			UIImage *buttonImageUnchecked;			
 	};
 }

+ 3 - 3
Modules/Contents/UI/Include/PolyUIColorBox.h

@@ -83,9 +83,9 @@ namespace Polycode {
 			UITextInput *bTextInput;
 			UITextInput *aTextInput;						
 									
-			SceneImage *mainFrame;
-			SceneImage *mainBg;			
-			SceneImage *hueFrame;
+			UIImage *mainFrame;
+			UIImage *mainBg;			
+			UIImage *hueFrame;
 			UIImage *hueSelector;
 			UIImage *mainSelector;	
 			

+ 2 - 2
Modules/Contents/UI/Source/PolyUICheckBox.cpp

@@ -41,10 +41,10 @@ UICheckBox::UICheckBox(String caption, bool checked) : UIElement() {
 	
 	this->checked = checked;
 	
-	buttonImageChecked = new SceneImage(checkImage);
+	buttonImageChecked = new UIImage(checkImage);
 	buttonImageChecked->visible = checked;
 
-	buttonImageUnchecked = new SceneImage(uncheckImage);
+	buttonImageUnchecked = new UIImage(uncheckImage);
 	buttonImageUnchecked->visible = !checked;
 	
 	captionLabel = new SceneLabel(caption, fontSize, fontName, Label::ANTIALIAS_FULL);

+ 3 - 3
Modules/Contents/UI/Source/PolyUIColorBox.cpp

@@ -47,11 +47,11 @@ UIColorPicker::UIColorPicker() : UIWindow(L"", 300, 240) {
 	String hueSelectorImage = conf->getStringValue("Polycode", "uiColorPickerHueSelector");
 	String mainSelectorImage = conf->getStringValue("Polycode", "uiColorPickerMainSelector");
 
-	mainBg = new SceneImage(mainBgImage);
+	mainBg = new UIImage(mainBgImage);
 	mainBg->setPosition(padding, topPadding+padding);
 	addChild(mainBg);
 
-	mainFrame = new SceneImage(mainFrameImage);
+	mainFrame = new UIImage(mainFrameImage);
 	mainFrame->setPosition(padding, topPadding+padding);
 	
 	alphaSlider = new UIHSlider(0, 1.0, mainFrame->getWidth());
@@ -65,7 +65,7 @@ UIColorPicker::UIColorPicker() : UIWindow(L"", 300, 240) {
 	addChild(mainColorRect);
 	addChild(mainFrame);
 
-	hueFrame = new SceneImage(hueFrameImage);
+	hueFrame = new UIImage(hueFrameImage);
 	hueFrame->setPosition(mainFrame->getPosition().x + mainFrame->getWidth()+10, topPadding+padding);
 	addChild(hueFrame);