added bitwidth to custom (JKFF update)

Author: ItchyTrack

CircuitLib/JK Flip-Flop.cir

@@ -1,31 +1,65 @@
-version_6
+version_7
 Circuit: "JK Flip Flop"
 UUID: 19975e43-7bf0-4be5-ae6d-384abf2a9be9
-size: <2, 3>
+size: 2x3
 ports:
-	(OUT, 3, 8, <1, 0>, "Q")
-	(IN, 2, 7, <0, 2>, "K")
-	(IN, 1, 6, <0, 1>, "CLK")
-	(IN, 0, 5, <0, 0>, "J")
-blockId 9 LIGHT 6 2 ZERO
-	(connId:0) (4 1)
-blockId 8 LIGHT 6 0 ZERO
-	(connId:0) (3 1)
-blockId 7 SWITCH -1 2 ZERO
-	(connId:0) (2 0)
-blockId 6 SWITCH -1 1 ZERO
-	(connId:0) (1 0) (2 0)
-blockId 5 SWITCH -1 0 ZERO
-	(connId:0) (1 0)
-blockId 4 NAND 4 2 ZERO
-	(connId:1) (9 0) (1 0) (3 0)
-	(connId:0) (2 1) (3 1)
-blockId 3 NAND 4 0 ZERO
-	(connId:0) (1 1) (4 1)
-	(connId:1) (8 0) (2 0) (4 0)
-blockId 2 NAND 1 2 ZERO
-	(connId:0) (3 1) (7 0) (6 0)
-	(connId:1) (4 0)
-blockId 1 NAND 1 0 ZERO
-	(connId:0) (6 0) (4 1) (5 0)
-	(connId:1) (3 0)
+	(OUT, 5, 5, <1, 2>, "Q'")
+	(IN, 4, 1, <0, 0>, "J")
+	(OUT, 3, 4, <1, 0>, "Q")
+	(IN, 2, 3, <0, 2>, "K")
+	(IN, 1, 2, <0, 1>, "CLK")
+blockId 92 AND 5 -5 NINETY_FLIPPED
+	(connId:1) (86 0) (69 0)
+	(connId:0) (85 1) (82 1)
+blockId 91 NOR 11 -2 ZERO
+	(connId:0) (90 1) (85 1)
+	(connId:1) (68 0) (5 0) (85 0)
+blockId 90 NOR 10 -2 ZERO
+	(connId:1) (91 0)
+	(connId:0) (2 0) (88 1)
+blockId 89 NAND 9 -4 ZERO
+	(connId:0) (88 1) (83 1)
+	(connId:1) (88 0) (84 0)
+blockId 88 NAND 9 -2 ZERO
+	(connId:1) (90 0) (89 0)
+	(connId:0) (89 1) (87 1)
+blockId 87 NAND 8 -2 ZERO
+	(connId:1) (88 0)
+	(connId:0) (2 0) (86 1)
+blockId 86 NOR 7 -2 ZERO
+	(connId:0) (70 1) (68 1) (92 1)
+	(connId:1) (87 0)
+blockId 85 NOR 11 -4 ZERO
+	(connId:1) (4 0) (92 0) (91 0)
+	(connId:0) (84 1) (91 1)
+blockId 84 NOR 10 -4 ZERO
+	(connId:1) (85 0)
+	(connId:0) (2 0) (89 1)
+blockId 83 NAND 8 -4 ZERO
+	(connId:0) (2 0) (69 1)
+	(connId:1) (89 0)
+blockId 82 NOR 4 -5 ZERO
+	(connId:1) (92 0)
+	(connId:0) (3 0) (1 0)
+blockId 72 NOT 4 -3 ZERO
+	(connId:1) (70 0)
+	(connId:0) (3 0)
+blockId 70 AND 5 -3 ZERO
+	(connId:1) (86 0) (69 0)
+	(connId:0) (1 0) (72 1)
+blockId 69 OR 7 -4 ZERO
+	(connId:1) (83 0)
+	(connId:0) (92 1) (70 1) (68 1)
+blockId 68 AND 5 -1 TWO_SEVENTY
+	(connId:1) (86 0) (69 0)
+	(connId:0) (91 1) (3 0) (1 0)
+blockId 5 LIGHT 13 -2 ZERO
+	(connId:0) (91 1)
+blockId 4 LIGHT 13 -4 ZERO
+	(connId:0) (85 1)
+blockId 3 SWITCH 2 -2 ZERO
+	(connId:0) (82 0) (72 0) (68 0)
+blockId 2 SWITCH 8 -3 ZERO
+	(connId:0) (87 0) (90 0) (84 0) (83 0)
+blockId 1 SWITCH 2 -4 ZERO
+	(connId:0) (82 0) (70 0) (68 0)

resources/gui/mainWindow/sideBar/icEditor/blockCreation.rcss

@@ -66,42 +66,47 @@ scrollbarvertical {
 	min-height: 18dp;
 	padding: 2dp 4dp;
 	margin: 1dp 1dp;
-	border-left: 2dp transparent;
 	border-radius: 3dp;
 	background:#2e2e2e;
 	display: flex;
+	flex-direction: column;
 	align-items: center;
 	gap: 2dp;
-	flex-wrap: wrap;
 }
 
-.connection-list-item .connection-break {
-	flex-basis: 100%;
-	height: 0;
-	padding: 0;
-	margin: 0;
+.connection-list-item > div {
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	align-items: flex-start;
 }
 
 .connection-list-item .connection-list-item-pos-x,
 .connection-list-item .connection-list-item-pos-y,
+.connection-list-item .connection-list-item-bit-width,
 .connection-list-item .set-position-button,
 .connection-list-item .remove-connection-button {
 	margin-top: 2dp;
 }
 
 .connection-list-item .connection-list-item-pos-x,
-.connection-list-item .connection-list-item-pos-y {
+.connection-list-item .connection-list-item-pos-y,
+.connection-list-item .connection-list-item-bit-width {
 	flex: 0 0 auto;
 }
 
-.connection-list-item > * {
+.connection-list-item > div > *:not(h1) {
 	margin-right: 2dp;
 }
 
-.connection-list-item > *:last-child {
+.connection-list-item > div > *:not(h1):last-child {
 	margin-right: 0;
 }
 
+.connection-list-item > div > h1 {
+	margin-right: 12dp;
+}
+
 .connection-list-item .set-position-button,
 .connection-list-item .remove-connection-button {
 	padding: 0 4dp;

resources/gui/mainWindow/sideBar/icEditor/blockCreation.rml

@@ -27,7 +27,6 @@
 					<button id="pick-new-texture" class="btn btn-sm">Pick Texture</button>
 					<button id="reload-texture" class="btn btn-sm">Reload Texture</button>
 					<button id="remove-texture" class="btn btn-sm">Remove Texture</button>
-					<!-- <button id="embed-texture" class="btn btn-sm">Embed in .cir</button> -->
 					<div class="form-row-2">
 						<input id="texture-uses-tilemap" type="checkbox" />
 						<label class="form-label" for="uses tilemap">Uses Tilemap</label>
@@ -53,10 +52,8 @@
 			</div>
 			<div id="connection-menu" class="surface-raised pad-sm">
 				<div class="section-header">Inputs <button id="connection-list-add-input" class="btn btn-outline btn-sm"><span>Add Input</span></button></div>
-				<div id="connection-list-input-headers" class="connection-list-headers">Name | Port X/Y | Block X/Y</div>
 				<div id="connection-list-input" class="connection-list scroll-y alt-rows"></div>
 				<div class="section-header">Outputs <button id="connection-list-add-output" class="btn btn-outline btn-sm"><span>Add Output</span></button></div>
-				<div id="connection-list-output-headers" class="connection-list-headers">Name | Port X/Y | Block X/Y</div>
 				<div id="connection-list-output" class="connection-list scroll-y alt-rows"></div>
 			</div>
 			<div class="form-actions">