Merge branch 'master' into conflict

Diya/DiyaBoot.class.st

@@ -83,10 +83,11 @@ DiyaBoot >> exampleNodes [
 	node borderColor: Color red.
 	node borderWidth: 3.0.
 	
-	style := DiyaFontManager uniqueInstance style: 'Regular' from:'Ubuntu'.
+	style := DiyaFontManager uniqueInstance style: 'Bold' from:'Ubuntu'.
+	"style := DiyaFontManager uniqueInstance style: 'Regular' from: 'bootstrap-icons'."
 	node := root addNode: (DiyaRectangle size: 208@288) at: 250 @ 50.
 	node color: (Color orange).
-	node texture: (style textureOf: 16).
+	node texture: (style textureOf: 48).
 	node borderColor: Color red.
 	node borderWidth: 3.0.
 	
@@ -108,7 +109,7 @@ DiyaBoot >> exampleNodes [
 	node color: Color white.
 	node borderWidth: 3.0.
 	node texture: tex.
-	"node rotation:(Float pi / 4.0)".
+
 	
 	node := root addNode: (DiyaConvexPolygon points:{250@100. 400@250. 450@80. 350@60}).
 	node color: Color green.

Diya/DiyaButton.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaButton,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaHbox.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaHbox,
+	#superclass : #DiyaLayout,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaIcon.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaIcon,
+	#superclass : #DiyaImageView,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaImageView.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaImageView,
+	#superclass : #DiyaRectangle,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaLabel.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaLabel,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaLayout.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaLayout,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaListView.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaListView,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaScrollPanel.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaScrollPanel,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaSwitch.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaSwitch,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaTableLayout.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaTableLayout,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaTextArea.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaTextArea,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaTextInput.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaTextInput,
+	#superclass : #DiyaWidget,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaVbox.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaVbox,
+	#superclass : #DiyaLayout,
+	#category : #'Diya-Widgets'
+}

Diya/DiyaWidget.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #DiyaWidget,
+	#superclass : #Diya2DNode,
+	#category : #'Diya-Widgets'
+}