WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/CEdit.ob07

     CB := Clipboard, Languages,
     ChangeLog, Scroll,
     RW, Ini, box_lib, Icons, Tabs, Timer;
 CONST
-    header = "CEdit (02-sep-2021)";
+    header = "CEdit (03-sep-2021)";
     ShellFilter = "";
     textsCount, curText: INTEGER;
     winWidth, winHeight: INTEGER;
     AppPath, runScript, buildScript, debugScript: RW.tFileName;
     OD: OpenDlg.Dialog;
-    confirm, notFound, search, searchOpened, modified: BOOLEAN;
+    confirm, notFound, menuFindClicked, search, searchOpened, modified: BOOLEAN;
     switch, closing: BOOLEAN;
     leftButton: BOOLEAN;
     context, menuFile, menuEdit, menuSearch, menuEncoding,
     menuView, menuSyntax, menuProgram, menuTools,
+    subCurLine, subIndent, subCase, subBookmark: Menu.tMenu;
-    subCurLine, subIndent, subCase, subBookmark: Menu.tMenu;
+    menuActive: BOOLEAN;
     icons: INTEGER;
 PROCEDURE NotFound;
 BEGIN
     IF notFound THEN
+        Message("not found");
+        IF menuFindClicked THEN
+        	menuFindClicked := FALSE
-        Message("not found");
+        ELSE
+        	notFound := FALSE
-        notFound := FALSE;
+        END;
         SetFocus(FindEdit, TRUE)
     END
         SetFocus(FindEdit, TRUE)
     END
 END Replaced;
+PROCEDURE drawIcon (icons, idx, x: INTEGER);
+BEGIN
+	Icons.draw(icons, idx, x + iconPad, btnTop + iconPad)
+END drawIcon;
 PROCEDURE toolbarIcons;
 VAR
-    x, color: INTEGER;
+    x, color, ico: INTEGER;
 BEGIN
     x := searchLeft + (toolBtnSize + 5)*2;
     IF text.modified THEN
-        Icons.draw(icons, 5, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
+    	ico := grayIcons
-        Icons.draw(grayIcons, 5, x + iconPad, btnTop + iconPad)
+    END;
-    END;
+    drawIcon(ico, 5, x);
     IF text.edition # NIL THEN
         x := searchLeft + (toolBtnSize + 5)*4 + toolbarDelim*2;
         IF ChangeLog.isFirstGuard(text.edition) THEN
-            Icons.draw(grayIcons, 37, x + iconPad, btnTop + iconPad)
+        	ico := grayIcons
+        ELSE
-        ELSE
+        	ico := icons
-            Icons.draw(icons, 37, x + iconPad, btnTop + iconPad)
+        END;
-        END;
+        drawIcon(ico, 37, x);
         x := searchLeft + (toolBtnSize + 5)*5 + toolbarDelim*2;
         IF ChangeLog.isLastGuard(text.edition) THEN
+        	ico := grayIcons
-            Icons.draw(grayIcons, 36, x + iconPad, btnTop + iconPad)
+        ELSE
-        ELSE
+        	ico := icons
-            Icons.draw(icons, 36, x + iconPad, btnTop + iconPad)
+        END;
-        END
+        drawIcon(ico, 36, x)
     K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, K.toolbarColor);
     K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, color, "ab");
     x := searchLeft + (toolBtnSize + 5)*8 + toolbarDelim*4;
     IF buildScript # "" THEN
-        Icons.draw(icons, 54, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
-        Icons.draw(grayIcons, 54, x + iconPad, btnTop + iconPad)
+    	ico := grayIcons
+    END;
+	drawIcon(ico, 54, x);
     END;
     INC(x, toolBtnSize + 5);
     IF runScript # "" THEN
-        Icons.draw(icons, 53, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
-        Icons.draw(grayIcons, 53, x + iconPad, btnTop + iconPad)
+    	ico := grayIcons
+    END;
-    END
+    drawIcon(ico, 53, x)
 END toolbarIcons;
         drawMainMenu(menuTools, menuToolsX, btnTools, "tools");
         x := searchLeft;
         drawToolbarBtn(btnNew, x);
-        Icons.draw(icons, 2, x + iconPad, btnTop + iconPad);
+        drawIcon(icons, 2, x);
         INC(x, toolBtnSize + 5);
         drawToolbarBtn(btnOpen, x);
-        Icons.draw(icons, 0, x + iconPad, btnTop + iconPad);
+        drawIcon(icons, 0, x);
         INC(x, toolBtnSize + 5);
         drawToolbarBtn(btnSave, x);
         INC(x, toolBtnSize + 5 + toolbarDelim);
     IF menu # NIL THEN
     	Timer.stop;
         IF Menu.opened(menu) THEN
             Menu.close(menu)
         END;
-        Menu.open(menu, x, y)
+        Menu.open(menu, x, y);
+        menuActive := TRUE
-    END;
+    END
 END ShowMenu;
 	    	IF vScroll.Dec THEN
 	    		T.scroll(text, 0, -1)
 	    	ELSIF vScroll.Inc THEN
 				T.scroll(text, 0, 1)
 	    	END;
+    		IF menuActive THEN
+    			draw_window;
+    			menuActive := FALSE
+    		ELSE
-        	repaint;
+    			repaint
+    		END;
     		IF (0 IN K.MouseState()) THEN
     			WHILE (0 IN K.MouseState()) & (delay > 0) DO
         			K.Pause(1);
         repaint
     |menuFind:
         ShowSearchPanel;
         SetFocus(FindEdit, TRUE)
     |menuFindNext:
-        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
+        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW));
+        menuFindClicked := TRUE
     |menuFindPrev:
-        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW))
+        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW));
+        menuFindClicked := TRUE
     |menuGoto:
         ShowSearchPanel;
         SetFocus(GotoEdit, TRUE)
     |menuToggleBookmark:
     	T.toggleLabel(text)
     Scroll.create(TRUE, scrollWidth, canvas.height, scrollWidth, scrollWidth, vScroll);
     T.resize(canvas.width, canvas.height);
     T.SetPos(text, 0, 0);
     confirm := FALSE;
     notFound := FALSE;
+    menuFindClicked := FALSE;
+    menuActive := FALSE;
     search := FALSE;
     searchOpened := FALSE;
     createSearchForm;
     new_searchText := "";
     searchText := "";

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9174 → 9175